diff options
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt | 14 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt | 12 |
2 files changed, 15 insertions, 11 deletions
diff --git a/app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt b/app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt index 5a7b9dc6..24cd8bbd 100644 --- a/app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt +++ b/app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt @@ -13,7 +13,6 @@ import android.view.Menu import android.view.MenuItem import android.view.MenuItem.OnActionExpandListener import android.view.WindowManager -import androidx.activity.addCallback import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult import androidx.activity.viewModels import androidx.appcompat.widget.SearchView @@ -215,9 +214,6 @@ class PasswordStore : BaseGitActivity() { override fun onStart() { super.onStart() refreshPasswordList() - onBackPressedDispatcher.addCallback { - isEnabled = getPasswordFragment()?.onBackPressedInActivity() == true - } } override fun onResume() { @@ -319,12 +315,20 @@ class PasswordStore : BaseGitActivity() { } } R.id.refresh -> refreshPasswordList() - android.R.id.home -> onBackPressedDispatcher.onBackPressed() + android.R.id.home -> { + @Suppress("DEPRECATION") onBackPressed() + } else -> return super.onOptionsItemSelected(item) } return true } + @Deprecated("Deprecated in Java") + @Suppress("DEPRECATION") + override fun onBackPressed() { + if (getPasswordFragment()?.onBackPressedInActivity() != true) super.onBackPressed() + } + private fun getPasswordFragment(): PasswordFragment? { return supportFragmentManager.findFragmentByTag(PASSWORD_FRAGMENT_TAG) as? PasswordFragment } diff --git a/app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt b/app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt index aea6acee..508120ce 100644 --- a/app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt @@ -7,7 +7,6 @@ package app.passwordstore.ui.settings import android.os.Bundle import android.view.MenuItem -import androidx.activity.addCallback import androidx.appcompat.app.AppCompatActivity import androidx.core.os.BundleCompat import app.passwordstore.R @@ -102,11 +101,6 @@ class SettingsActivity : AppCompatActivity() { binding.preferenceRecyclerView.adapter = adapter } - override fun onStart() { - super.onStart() - onBackPressedDispatcher.addCallback { isEnabled = !preferencesAdapter.goBack() } - } - override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) outState.putParcelable("adapter", preferencesAdapter.getSavedState()) @@ -123,4 +117,10 @@ class SettingsActivity : AppCompatActivity() { else -> super.onOptionsItemSelected(item) } } + + @Deprecated("Deprecated in Java") + @Suppress("DEPRECATION") + override fun onBackPressed() { + if (!preferencesAdapter.goBack()) super.onBackPressed() + } } |