Skip to content

Commit 1a9358f

Browse files
committed
fix: migrate away from deprecated onBackPressed()
1 parent 3041bdf commit 1a9358f

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

app/src/main/kotlin/org/fossify/phone/dialogs/SelectContactDialog.kt

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.fossify.phone.dialogs
22

33
import android.graphics.Color
4-
import android.view.KeyEvent
54
import android.view.inputmethod.EditorInfo
65
import android.widget.ImageView
6+
import androidx.activity.addCallback
77
import androidx.appcompat.app.AlertDialog
88
import org.fossify.commons.extensions.*
99
import org.fossify.commons.models.contacts.Contact
@@ -37,15 +37,17 @@ class SelectContactDialog(val activity: SimpleActivity, val contacts: List<Conta
3737

3838
activity.getAlertDialogBuilder()
3939
.setNegativeButton(R.string.cancel, null)
40-
.setOnKeyListener { _, i, keyEvent ->
41-
if (keyEvent.action == KeyEvent.ACTION_UP && i == KeyEvent.KEYCODE_BACK) {
42-
backPressed()
43-
}
44-
true
45-
}
4640
.apply {
4741
activity.setupDialogStuff(binding.root, this, R.string.choose_contact) { alertDialog ->
4842
dialog = alertDialog
43+
alertDialog.onBackPressedDispatcher.addCallback(alertDialog) {
44+
if (binding.contactSearchView.isSearchOpen) {
45+
binding.contactSearchView.closeSearch()
46+
} else {
47+
isEnabled = false
48+
alertDialog.onBackPressedDispatcher.onBackPressed()
49+
}
50+
}
4951
}
5052
}
5153
}
@@ -122,12 +124,4 @@ class SelectContactDialog(val activity: SimpleActivity, val contacts: List<Conta
122124
letterFastscroller.beVisibleIf(contactsEmptyPlaceholder.isGone())
123125
letterFastscrollerThumb.beVisibleIf(contactsEmptyPlaceholder.isGone())
124126
}
125-
126-
private fun backPressed() {
127-
if (binding.contactSearchView.isSearchOpen) {
128-
binding.contactSearchView.closeSearch()
129-
} else {
130-
dialog?.dismiss()
131-
}
132-
}
133127
}

0 commit comments

Comments
 (0)