Finalized call hold/unhold improvents
This commit is contained in:
@@ -11,9 +11,6 @@ import android.content.pm.PackageManager
|
|||||||
import android.content.res.Configuration.ORIENTATION_PORTRAIT
|
import android.content.res.Configuration.ORIENTATION_PORTRAIT
|
||||||
import android.media.AudioManager
|
import android.media.AudioManager
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Build
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.os.CountDownTimer
|
|
||||||
import android.provider.DocumentsContract
|
import android.provider.DocumentsContract
|
||||||
import android.provider.MediaStore
|
import android.provider.MediaStore
|
||||||
import android.text.InputType
|
import android.text.InputType
|
||||||
@@ -23,6 +20,7 @@ import android.view.inputmethod.InputMethodManager
|
|||||||
import android.widget.*
|
import android.widget.*
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
|
import android.os.*
|
||||||
import androidx.activity.result.ActivityResultLauncher
|
import androidx.activity.result.ActivityResultLauncher
|
||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.annotation.RequiresApi
|
import androidx.annotation.RequiresApi
|
||||||
@@ -40,6 +38,8 @@ import java.io.File
|
|||||||
import java.io.FileInputStream
|
import java.io.FileInputStream
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
import java.net.URLDecoder
|
import java.net.URLDecoder
|
||||||
|
import java.util.*
|
||||||
|
import kotlin.collections.ArrayList
|
||||||
import kotlin.system.exitProcess
|
import kotlin.system.exitProcess
|
||||||
|
|
||||||
class MainActivity : AppCompatActivity() {
|
class MainActivity : AppCompatActivity() {
|
||||||
@@ -363,12 +363,12 @@ class MainActivity : AppCompatActivity() {
|
|||||||
Log.d(TAG, "AoR $aor resuming call ${call.callp} with ${callUri.text}")
|
Log.d(TAG, "AoR $aor resuming call ${call.callp} with ${callUri.text}")
|
||||||
call.resume()
|
call.resume()
|
||||||
call.onhold = false
|
call.onhold = false
|
||||||
holdButton.setImageResource(R.drawable.resume)
|
holdButton.setImageResource(R.drawable.hold)
|
||||||
} else {
|
} else {
|
||||||
Log.d(TAG, "AoR $aor holding call ${call.callp} with ${callUri.text}")
|
Log.d(TAG, "AoR $aor holding call ${call.callp} with ${callUri.text}")
|
||||||
call.hold()
|
call.hold()
|
||||||
call.onhold = true
|
call.onhold = true
|
||||||
holdButton.setImageResource(R.drawable.hold)
|
holdButton.setImageResource(R.drawable.resume)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1774,8 +1774,9 @@ class MainActivity : AppCompatActivity() {
|
|||||||
callControl.visibility = View.VISIBLE
|
callControl.visibility = View.VISIBLE
|
||||||
if (call.held) {
|
if (call.held) {
|
||||||
imm.hideSoftInputFromWindow(dtmf.windowToken, 0)
|
imm.hideSoftInputFromWindow(dtmf.windowToken, 0)
|
||||||
onHoldNotice.text = getString(R.string.call_on_hold_by_peer)
|
Handler(Looper.getMainLooper()).postDelayed({
|
||||||
onHoldNotice.visibility = View.VISIBLE
|
onHoldNotice.visibility = View.VISIBLE
|
||||||
|
}, 250)
|
||||||
} else {
|
} else {
|
||||||
onHoldNotice.visibility = View.GONE
|
onHoldNotice.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -159,7 +159,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="0dp"
|
android:padding="0dp"
|
||||||
android:src="@drawable/pause"
|
android:src="@drawable/hold"
|
||||||
android:background="@null"
|
android:background="@null"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
android:contentDescription="@string/hold" >
|
android:contentDescription="@string/hold" >
|
||||||
@@ -223,7 +223,7 @@
|
|||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textColor="@color/colorAccent"
|
android:textColor="@color/colorAccent"
|
||||||
android:text="@string/call_on_hold_by_peer" >
|
android:text="@string/call_is_on_hold" >
|
||||||
</TextView>
|
</TextView>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|||||||
@@ -429,6 +429,7 @@
|
|||||||
<string name="allow_video_send">Salli video videon lähetys puhelussa \'%1$s\'?</string>
|
<string name="allow_video_send">Salli video videon lähetys puhelussa \'%1$s\'?</string>
|
||||||
<string name="allow_video_recv">Salli video videon vastaanotto puhelussa \'%1$s\'?</string>
|
<string name="allow_video_recv">Salli video videon vastaanotto puhelussa \'%1$s\'?</string>
|
||||||
<string name="hold">Aseta puhelu pitoon</string>
|
<string name="hold">Aseta puhelu pitoon</string>
|
||||||
|
<string name="call_is_on_hold">Puhelu on pidossa</string>
|
||||||
<string name="mic">Mikrofoni päälle/pois</string>
|
<string name="mic">Mikrofoni päälle/pois</string>
|
||||||
<string name="call_transfer">Puhelun siirto</string>
|
<string name="call_transfer">Puhelun siirto</string>
|
||||||
<string name="transfer_destination">Siirron kohde</string>
|
<string name="transfer_destination">Siirron kohde</string>
|
||||||
|
|||||||
@@ -390,6 +390,7 @@
|
|||||||
<string name="allow_video_send">Accept sending of video to \'%1$s\'?</string>
|
<string name="allow_video_send">Accept sending of video to \'%1$s\'?</string>
|
||||||
<string name="allow_video_recv">Accept receiving video from \'%1$s\'?</string>
|
<string name="allow_video_recv">Accept receiving video from \'%1$s\'?</string>
|
||||||
<string name="hold">Call Hold/Unhold</string>
|
<string name="hold">Call Hold/Unhold</string>
|
||||||
|
<string name="call_is_on_hold">Call is on hold</string>
|
||||||
<string name="mic">Microphone On/Off</string>
|
<string name="mic">Microphone On/Off</string>
|
||||||
<string name="call_transfer">Call Transfer</string>
|
<string name="call_transfer">Call Transfer</string>
|
||||||
<string name="transfer_destination">Transfer destination</string>
|
<string name="transfer_destination">Transfer destination</string>
|
||||||
@@ -429,7 +430,6 @@
|
|||||||
<string name="call_is_secure">This call is SECURE and peer is VERIFIED!
|
<string name="call_is_secure">This call is SECURE and peer is VERIFIED!
|
||||||
Do you want to unverify the peer?
|
Do you want to unverify the peer?
|
||||||
</string>
|
</string>
|
||||||
<string name="call_on_hold_by_peer">Call is on hold by peer</string>
|
|
||||||
<string name="unverify">Unverify</string>
|
<string name="unverify">Unverify</string>
|
||||||
<string name="backed_up">Application data has been backed up to file \'%1$s\'. In Android
|
<string name="backed_up">Application data has been backed up to file \'%1$s\'. In Android
|
||||||
versions 9 and below, the file is in Download folder.</string>
|
versions 9 and below, the file is in Download folder.</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user