Pārlūkot izejas kodu

Merge pull request #9179 from sryze/contact-settings-back-fix

Prevent duplicate Settings activity on back stack
Álvaro Brey 3 gadi atpakaļ
vecāks
revīzija
578da09f05

+ 3 - 0
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.java

@@ -301,8 +301,11 @@ public class BackupFragment extends FileFragment implements DatePickerDialog.OnD
                     } else {
                     } else {
                         contactsPreferenceActivity.openDrawer();
                         contactsPreferenceActivity.openDrawer();
                     }
                     }
+                } else if (getActivity() != null) {
+                    getActivity().finish();
                 } else {
                 } else {
                     Intent settingsIntent = new Intent(getContext(), SettingsActivity.class);
                     Intent settingsIntent = new Intent(getContext(), SettingsActivity.class);
+                    settingsIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                     startActivity(settingsIntent);
                     startActivity(settingsIntent);
                 }
                 }
                 retval = true;
                 retval = true;