Reload original members from file

MarcusWolschon · Oct 10, 2018 · b1ebe4e · b1ebe4e
1 parent e0e8c89
commit b1ebe4e
Showing 1 changed file with 25 additions and 16 deletions.
diff --git a/src/main/java/de/blau/android/propertyeditor/RelationMembersFragment.java b/src/main/java/de/blau/android/propertyeditor/RelationMembersFragment.java
@@ -62,10 +62,11 @@ public class RelationMembersFragment extends BaseFragment implements PropertyRow
 
     private LayoutInflater inflater = null;
 
-    private ArrayList<RelationMemberDescription>                         savedMembers = null;
-    private long                                                         id           = -1;
-    private transient SavingHelper<ArrayList<RelationMemberDescription>> savingHelper = new SavingHelper<>();
-    public static final String                                           FILENAME     = "members.res";
+    private ArrayList<RelationMemberDescription>                         savedMembers          = null;
+    private long                                                         id                    = -1;
+    private transient SavingHelper<ArrayList<RelationMemberDescription>> savingHelper          = new SavingHelper<>();
+    public static final String                                           FILENAME_MEMBERS      = "members.res";
+    public static final String                                           FILENAME_ORIG_MEMBERS = "orig_members.res";
 
     private int maxStringLength; // maximum key, value and role length
 
@@ -135,9 +136,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         if (savedInstanceState != null) {
             Log.d(DEBUG_TAG, "Restoring from saved state");
             id = savedInstanceState.getLong(ID_KEY);
-            members = savingHelper.load(getContext(), FILENAME, true);
+            members = savingHelper.load(getContext(), FILENAME_MEMBERS, true);
             if (members != null) {
-                for (RelationMemberDescription rmd:members) {
+                for (RelationMemberDescription rmd : members) {
                     rmd.update();
                 }
             }
@@ -147,14 +148,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         } else {
             id = getArguments().getLong(ID_KEY);
             members = (ArrayList<RelationMemberDescription>) getArguments().getSerializable(MEMBERS_KEY);
+            /*
+             * Saving this argument (done by the FragmentManager) will typically exceed the 1MB transaction size limit
+             * and cause a android.os.TransactionTooLargeException
+             */
+            getArguments().remove(MEMBERS_KEY);
+            /*
+             * Save to file for undo
+             */
+            savingHelper.save(getContext(), FILENAME_ORIG_MEMBERS, members, true);
         }
 
-        /*
-         * Saving this argument (done by the FragmentManager) will typically exceed the 1MB transaction size limit and
-         * cause a android.os.TransactionTooLargeException
-         */
-        getArguments().remove(MEMBERS_KEY);
-
         Preferences prefs = new Preferences(getActivity());
         Server server = prefs.getServer();
         maxStringLength = server.getCachedCapabilities().getMaxStringLength();
@@ -416,7 +420,7 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         Log.d(DEBUG_TAG, "onSaveInstanceState");
         outState.putLong(ID_KEY, id);
-        savingHelper.save(getContext(), FILENAME, savedMembers, true);
+        savingHelper.save(getContext(), FILENAME_MEMBERS, savedMembers, true);
         Log.w(DEBUG_TAG, "onSaveInstanceState bundle size " + Util.getBundleSize(outState));
     }
 
@@ -983,11 +987,16 @@ public boolean onOptionsItemSelected(final MenuItem item) {
     }
 
     /**
-     * reload original arguments
+     * reload original member list
      */
-    @SuppressWarnings("unchecked")
     void doRevert() {
-        loadMembers((ArrayList<RelationMemberDescription>) getArguments().getSerializable(MEMBERS_KEY));
+        ArrayList<RelationMemberDescription> members = savingHelper.load(getContext(), FILENAME_ORIG_MEMBERS, true);
+        if (members != null) {
+            for (RelationMemberDescription rmd : members) {
+                rmd.update();
+            }
+        }
+        loadMembers(members);
         setIcons();
     }