Skip to content

Fix unresponsive UI after pressing back on the unlock screen, fixes #648 #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SailReal merged 1 commit into from
Sep 20, 2026
Merged

Fix unresponsive UI after pressing back on the unlock screen, fixes #648 #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions ...src/main/java/org/cryptomator/presentation/ui/dialog/BiometricAuthKeyInvalidatedDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.cryptomator.presentation.ui.dialog

import android.content.DialogInterface
import android.view.KeyEvent
import androidx.appcompat.app.AlertDialog
import org.cryptomator.generator.Dialog
import org.cryptomator.presentation.R
Expand All @@ -19,19 +18,15 @@ class BiometricAuthKeyInvalidatedDialog : BaseDialog<BiometricAuthKeyInvalidated
public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
builder //
.setTitle(R.string.dialog_biometric_auth_key_invalidated_title) //
.setNegativeButton(getString(R.string.dialog_biometric_auth_key_invalidated_neutral_button)) { _: DialogInterface, _: Int -> }
.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog?.dismiss()
callback?.onBiometricAuthKeyInvalidatedDialogFinished()
true
} else {
false
}
}
.setNegativeButton(getString(R.string.dialog_biometric_auth_key_invalidated_neutral_button)) { _: DialogInterface, _: Int -> callback?.onBiometricAuthKeyInvalidatedDialogFinished() }
return builder.create()
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onBiometricAuthKeyInvalidatedDialogFinished()
}

override fun onStart() {
super.onStart()
val dialog = dialog as AlertDialog?
Expand Down
15 changes: 5 additions & 10 deletions presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ChangePasswordDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.cryptomator.presentation.ui.dialog

import android.content.DialogInterface
import android.os.Bundle
import android.view.KeyEvent
import android.view.View
import android.widget.Button
import android.widget.LinearLayout
Expand Down Expand Up @@ -54,15 +53,6 @@ class ChangePasswordDialog : BaseProgressErrorDialog<ChangePasswordDialog.Callba
}
}
dialog.setCanceledOnTouchOutside(false)
dialog.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog.dismiss()
callback?.onChangePasswordCanceled()
true
} else {
false
}
}
binding.etOldPassword.requestFocus()
binding.etOldPassword.nextFocusForwardId = binding.etNewPassword.id
binding.etNewPassword.nextFocusForwardId = binding.etNewRetypePassword.id
Expand All @@ -81,6 +71,11 @@ class ChangePasswordDialog : BaseProgressErrorDialog<ChangePasswordDialog.Callba
}
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onChangePasswordCanceled()
}

private fun valid(oldPassword: String, newPassword: String, newRetypedPassword: String): Boolean {
return when {
oldPassword.isEmpty() -> {
Expand Down
15 changes: 5 additions & 10 deletions presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CreateHubDeviceDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.cryptomator.presentation.ui.dialog

import android.content.DialogInterface
import android.os.Bundle
import android.view.KeyEvent
import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
Expand Down Expand Up @@ -40,15 +39,6 @@ class CreateHubDeviceDialog : BaseProgressErrorDialog<CreateHubDeviceDialog.Call
}
}
dialog.setCanceledOnTouchOutside(false)
dialog.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog.dismiss()
callback?.onCreateHubDeviceCanceled()
true
} else {
false
}
}
binding.etDeviceName.requestFocus()
binding.etDeviceName.nextFocusForwardId = binding.etSetupCode.id
createDeviceButton?.let {
Expand All @@ -58,6 +48,11 @@ class CreateHubDeviceDialog : BaseProgressErrorDialog<CreateHubDeviceDialog.Call
}
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onCreateHubDeviceCanceled()
}

private fun valid(name: String, setupCode: String): Boolean {
return when {
name.isEmpty() -> {
Expand Down
17 changes: 6 additions & 11 deletions presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnterPasswordDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.content.DialogInterface
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
import android.view.KeyEvent
import android.view.View
import android.widget.Button
import android.widget.LinearLayout
Expand Down Expand Up @@ -48,20 +47,16 @@ class EnterPasswordDialog : BaseProgressErrorDialog<EnterPasswordDialog.Callback
binding.etPassword.nextFocusForwardId = button.id
}
dialog.setCanceledOnTouchOutside(false)
dialog.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog.dismiss()
callback?.onUnlockCanceled()
callback?.closeDialog()
true
} else {
false
}
}
binding.etPassword.requestFocus()
}
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onUnlockCanceled()
callback?.closeDialog()
}

public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
return builder //
.setTitle(vaultModel().name) //
Expand Down
15 changes: 5 additions & 10 deletions ...n/src/main/java/org/cryptomator/presentation/ui/dialog/HubLicenseUpgradeRequiredDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.cryptomator.presentation.ui.dialog

import android.content.DialogInterface
import android.view.KeyEvent
import androidx.appcompat.app.AlertDialog
import org.cryptomator.generator.Dialog
import org.cryptomator.presentation.R
Expand All @@ -19,18 +18,14 @@ class HubLicenseUpgradeRequiredDialog : BaseDialog<HubLicenseUpgradeRequiredDial
builder //
.setTitle(R.string.dialog_hub_license_upgrade_required_title) //
.setNeutralButton(getString(R.string.dialog_hub_license_upgrade_required_neutral_button)) { _: DialogInterface, _: Int -> callback?.onHubLicenseUpgradeRequiredDialogFinished() }
.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog?.dismiss()
callback?.onHubLicenseUpgradeRequiredDialogFinished()
true
} else {
false
}
}
return builder.create()
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onHubLicenseUpgradeRequiredDialogFinished()
}

public override fun setupView() {
}

Expand Down
15 changes: 5 additions & 10 deletions ...tation/src/main/java/org/cryptomator/presentation/ui/dialog/HubUserSetupRequiredDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.cryptomator.presentation.ui.dialog

import android.content.DialogInterface
import android.os.Bundle
import android.view.KeyEvent
import androidx.appcompat.app.AlertDialog
import org.cryptomator.domain.UnverifiedHubVaultConfig
import org.cryptomator.generator.Dialog
Expand All @@ -24,18 +23,14 @@ class HubUserSetupRequiredDialog : BaseDialog<HubUserSetupRequiredDialog.Callbac
.setTitle(R.string.dialog_hub_user_setup_required_title) //
.setPositiveButton(getString(R.string.dialog_hub_user_setup_required_neutral_button)) { _: DialogInterface, _: Int -> } //
.setNegativeButton(getString(R.string.dialog_hub_user_setup_required_negative_button)) { _: DialogInterface, _: Int -> callback?.onCancelHubUserSetupClicked() } //
.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog?.dismiss()
callback?.onCancelHubUserSetupClicked()
true
} else {
false
}
}
return builder.create()
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onCancelHubUserSetupClicked()
}

override fun onStart() {
super.onStart()
val dialog = dialog as AlertDialog?
Expand Down
15 changes: 5 additions & 10 deletions ...ion/src/main/java/org/cryptomator/presentation/ui/dialog/HubVaultAccessForbiddenDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.cryptomator.presentation.ui.dialog

import android.content.DialogInterface
import android.view.KeyEvent
import androidx.appcompat.app.AlertDialog
import org.cryptomator.generator.Dialog
import org.cryptomator.presentation.R
Expand All @@ -19,18 +18,14 @@ class HubVaultAccessForbiddenDialog : BaseDialog<HubVaultAccessForbiddenDialog.C
builder //
.setTitle(R.string.dialog_hub_vault_access_forbidden_title) //
.setNeutralButton(getString(R.string.dialog_hub_vault_access_forbidden_neutral_button)) { _: DialogInterface, _: Int -> callback?.onVaultAccessForbiddenDialogFinished() } //
.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog?.dismiss()
callback?.onVaultAccessForbiddenDialogFinished()
true
} else {
false
}
}
return builder.create()
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onVaultAccessForbiddenDialogFinished()
}

public override fun setupView() {
}

Expand Down
15 changes: 5 additions & 10 deletions presentation/src/main/java/org/cryptomator/presentation/ui/dialog/HubVaultArchivedDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.cryptomator.presentation.ui.dialog

import android.content.DialogInterface
import android.view.KeyEvent
import androidx.appcompat.app.AlertDialog
import org.cryptomator.generator.Dialog
import org.cryptomator.presentation.R
Expand All @@ -19,18 +18,14 @@ class HubVaultArchivedDialog : BaseDialog<HubVaultArchivedDialog.Callback, Dialo
builder //
.setTitle(R.string.dialog_hub_vault_archived_title) //
.setNeutralButton(getString(R.string.dialog_hub_vault_archived_positive_button)) { _: DialogInterface, _: Int -> callback?.onHubVaultArchivedDialogFinished() }
.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_BACK) {
dialog?.dismiss()
callback?.onHubVaultArchivedDialogFinished()
true
} else {
false
}
}
return builder.create()
}

override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
callback?.onHubVaultArchivedDialogFinished()
}

public override fun setupView() {
super.onStart()
val dialog = dialog as AlertDialog?
Expand Down
Loading