fix: back press handling in settings activity #15949
Conversation
|
/backport to stable-3.34 |
|
|
||
| @SuppressLint("GestureBackNavigation") | ||
| @Override | ||
| public void onBackPressed() { |
There was a problem hiding this comment.
No need to override the back press behavior, since the back press will handle itself and display whatever is in the stack.
| contactsPreferenceActivity.finish() | ||
| } else { | ||
| val settingsIntent = Intent(context, SettingsActivity::class.java) | ||
| settingsIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP |
There was a problem hiding this comment.
Don't clear stack so that we can go back from SettingsActivity
| handleMnemonicRequest(data); | ||
| } else if (requestCode == ACTION_E2E && data != null && data.getBooleanExtra(SetupEncryptionDialogFragment.SUCCESS, false)) { | ||
| Intent i = new Intent(this, SettingsActivity.class); | ||
| i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); |
There was a problem hiding this comment.
Don't clear stack so that we can go back from SettingsActivity
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
alperozturk96
force-pushed
the
fix/back-press-settings-activity
branch
from
1243dee to
53d4731
Compare
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
|
test-Unit test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/15949-Unit-test-10-17 |
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15949.apk |
Fixes
Fixes drawer menu highlighting and transition from
SettingsActivity.Old related PR: #15384