fix: back press handling in settings activity

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -558,7 +558,11 @@ public void onMessageEvent(DummyDrawerEvent event) {
 
     private void onNavigationItemClicked(final MenuItem menuItem) {
         int itemId = menuItem.getItemId();
-        menuItemId = itemId;
+
+        if (itemId != R.id.nav_settings) {
+            menuItemId = itemId;
+        }
+
         setNavigationViewItemChecked();
 
         if (itemId == R.id.nav_all_files || itemId == R.id.nav_personal_files) {
@@ -602,13 +606,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
             startActivity(ActivitiesActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
         } else if (itemId == R.id.nav_settings) {
             resetOnlyPersonalAndOnDevice();
-
-            /**
-             * Since pressing the back button in SettingsActivity always returns to the all file list, we can clear the stack.
-             * {@link SettingsActivity#onBackPressed()
-             */
             final Intent intent = new Intent(this, SettingsActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             startActivity(intent);
         } else if (itemId == R.id.nav_community) {
             resetOnlyPersonalAndOnDevice();

app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -15,7 +15,6 @@
  */
 package com.owncloud.android.ui.activity;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -358,16 +357,6 @@ private void setupAboutCategory(String appVersion) {
         }
     }
 
-    @SuppressLint("GestureBackNavigation")
-    @Override
-    public void onBackPressed() {
-        DrawerActivity.menuItemId = R.id.nav_all_files;
-        Intent i = new Intent(this, FileDisplayActivity.class);
-        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        i.setAction(FileDisplayActivity.ALL_FILES);
-        startActivity(i);
-    }
-
     private void setupSyncCategory() {
         final PreferenceCategory preferenceCategorySync = (PreferenceCategory) findPreference("sync");
         viewThemeUtils.files.themePreferenceCategory(preferenceCategorySync);
@@ -1056,8 +1045,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             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);
-            i.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
             startActivity(i);
         } else if (requestCode == ACTION_SET_STORAGE_LOCATION && data != null) {
             String newPath = data.getStringExtra(ChooseStorageLocationActivity.KEY_RESULT_STORAGE_LOCATION);

app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt

@@ -336,7 +336,6 @@ class BackupFragment :
                 contactsPreferenceActivity.finish()
             } else {
                 val settingsIntent = Intent(context, SettingsActivity::class.java)
-                settingsIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
                 startActivity(settingsIntent)
             }
             return true