Migration to API 33

app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt

@@ -9,6 +9,7 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.*
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import com.tutpro.baresip.databinding.ActivityAccountBinding
 import kotlinx.coroutines.CoroutineScope
@@ -61,6 +62,12 @@ class AccountActivity : AppCompatActivity() {
 
     private val scope = CoroutineScope(Job() + Dispatchers.Main)
 
+    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            goBack()
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
@@ -108,6 +115,8 @@ class AccountActivity : AppCompatActivity() {
 
         bindTitles()
 
+        onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
+
     }
 
     private fun initAccountFromConfig(ctx: AccountActivity) {
@@ -650,7 +659,7 @@ class AccountActivity : AppCompatActivity() {
             }
 
             android.R.id.home -> {
-                onBackPressed()
+                goBack()
                 return true
             }
 
@@ -660,7 +669,7 @@ class AccountActivity : AppCompatActivity() {
 
     }
 
-    override fun onBackPressed() {
+    private fun goBack() {
         BaresipService.activities.remove("account,$aor")
         returnResult(Activity.RESULT_CANCELED)
     }