Skip to content

Conversation

@alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Nov 12, 2025

  • Tests written, or not not needed

Fixes

Fixes drawer menu highlighting and transition from SettingsActivity.

Old related PR: #15384

@alperozturk96
Copy link
Collaborator Author

/backport to stable-3.34


@SuppressLint("GestureBackNavigation")
@Override
public void onBackPressed() {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't clear stack so that we can go back from SettingsActivity

tobiasKaminsky

This comment was marked as resolved.

@alperozturk96 alperozturk96 force-pushed the fix/back-press-settings-activity branch from dc7ffca to 3a2b748 Compare November 28, 2025 13:26
@github-actions
Copy link

Codacy

SpotBugs

CategoryBaseNew
Bad practice4243
Correctness7474
Dodgy code276267
Experimental11
Internationalization77
Malicious code vulnerability22
Multithreaded correctness3535
Performance4848
Security1818
Total503495

@github-actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15949.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@github-actions
Copy link

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

@github-actions
Copy link

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants