From 86ca2c00fc3593fb9544e5a6b6a4fc0088c3912e Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 2 Mar 2019 07:35:12 +0000 Subject: [PATCH] Scoped saved instance values --- .../java/eu/faircode/email/ActivitySetup.java | 4 ++-- .../java/eu/faircode/email/ActivityView.java | 4 ++-- .../eu/faircode/email/FragmentAccount.java | 20 ++++++++-------- .../java/eu/faircode/email/FragmentBase.java | 4 ++-- .../eu/faircode/email/FragmentCompose.java | 8 +++---- .../eu/faircode/email/FragmentFolders.java | 4 ++-- .../eu/faircode/email/FragmentIdentity.java | 24 +++++++++---------- .../eu/faircode/email/FragmentMessages.java | 20 ++++++++-------- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 81f6778f0f..fb0c123d98 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -251,7 +251,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On } if (savedInstanceState != null) - drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("toggle")); + drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("fair:toggle")); DB.getInstance(this).account().liveSynchronizingAccounts().observe(this, new Observer>() { @Override @@ -264,7 +264,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putBoolean("toggle", drawerToggle.isDrawerIndicatorEnabled()); + outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled()); } @Override diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index fa06778dcb..a689166932 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -372,7 +372,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB init(); if (savedInstanceState != null) - drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("toggle")); + drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("fair:toggle")); new Handler().post(checkIntent); @@ -481,7 +481,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putBoolean("toggle", drawerToggle.isDrawerIndicatorEnabled()); + outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled()); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 103b9e0d5e..070b0118b5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -1081,11 +1081,11 @@ public class FragmentAccount extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putInt("provider", spProvider.getSelectedItemPosition()); - outState.putInt("auth_type", auth_type); - outState.putString("password", tilPassword.getEditText().getText().toString()); - outState.putInt("advanced", grpAdvanced.getVisibility()); - outState.putInt("color", color); + outState.putInt("fair:provider", spProvider.getSelectedItemPosition()); + outState.putInt("fair:auth_type", auth_type); + outState.putString("fair:password", tilPassword.getEditText().getText().toString()); + outState.putInt("fair:advanced", grpAdvanced.getVisibility()); + outState.putInt("fair:color", color); } @Override @@ -1174,14 +1174,14 @@ public class FragmentAccount extends FragmentBase { } }.execute(FragmentAccount.this, new Bundle(), "account:primary"); } else { - int provider = savedInstanceState.getInt("provider"); + int provider = savedInstanceState.getInt("fair:provider"); spProvider.setTag(provider); spProvider.setSelection(provider); - auth_type = savedInstanceState.getInt("auth_type"); - tilPassword.getEditText().setText(savedInstanceState.getString("password")); - grpAdvanced.setVisibility(savedInstanceState.getInt("advanced")); - color = savedInstanceState.getInt("color"); + auth_type = savedInstanceState.getInt("fair:auth_type"); + tilPassword.getEditText().setText(savedInstanceState.getString("fair:password")); + grpAdvanced.setVisibility(savedInstanceState.getInt("fair:advanced")); + color = savedInstanceState.getInt("fair:color"); } Helper.setViewsEnabled(view, true); diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java index b2e207b6ad..e99d488c21 100644 --- a/app/src/main/java/eu/faircode/email/FragmentBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentBase.java @@ -56,7 +56,7 @@ public class FragmentBase extends Fragment { public void onSaveInstanceState(Bundle outState) { Log.i("Save instance " + this); super.onSaveInstanceState(outState); - outState.putString("subtitle", subtitle); + outState.putString("fair:subtitle", subtitle); } @Override @@ -64,7 +64,7 @@ public class FragmentBase extends Fragment { Log.i("Create " + this + " saved=" + (savedInstanceState != null)); super.onCreate(savedInstanceState); if (savedInstanceState != null) - subtitle = savedInstanceState.getString("subtitle"); + subtitle = savedInstanceState.getString("fair:subtitle"); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index a3b37c3738..b074991cdc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -594,8 +594,8 @@ public class FragmentCompose extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putLong("working", working); - outState.putBoolean("show_images", show_images); + outState.putLong("fair:working", working); + outState.putBoolean("fair:show_images", show_images); } @Override @@ -628,8 +628,8 @@ public class FragmentCompose extends FragmentBase { draftLoader.execute(this, args, "compose:edit"); } } else { - working = savedInstanceState.getLong("working"); - show_images = savedInstanceState.getBoolean("show_images"); + working = savedInstanceState.getLong("fair:working"); + show_images = savedInstanceState.getBoolean("fair:show_images"); Bundle args = new Bundle(); args.putString("action", working < 0 ? "new" : "edit"); diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index f3eddf40a6..fde8b8813b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -192,7 +192,7 @@ public class FragmentFolders extends FragmentBase { public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); if (show_hidden != null) - outState.putBoolean("show_hidden", show_hidden); + outState.putBoolean("fair:show_hidden", show_hidden); } @Override @@ -200,7 +200,7 @@ public class FragmentFolders extends FragmentBase { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { - show_hidden = (Boolean) savedInstanceState.get("show_hidden"); + show_hidden = (Boolean) savedInstanceState.get("fair:show_hidden"); getActivity().invalidateOptionsMenu(); } diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 97aa353e9d..391fb4321d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -715,12 +715,12 @@ public class FragmentIdentity extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putInt("account", spAccount.getSelectedItemPosition()); - outState.putInt("provider", spProvider.getSelectedItemPosition()); - outState.putInt("auth_type", auth_type); - outState.putString("password", tilPassword.getEditText().getText().toString()); - outState.putInt("advanced", grpAdvanced.getVisibility()); - outState.putInt("color", color); + outState.putInt("fair:account", spAccount.getSelectedItemPosition()); + outState.putInt("fair:provider", spProvider.getSelectedItemPosition()); + outState.putInt("fair:auth_type", auth_type); + outState.putString("fair:password", tilPassword.getEditText().getText().toString()); + outState.putInt("fair:advanced", grpAdvanced.getVisibility()); + outState.putInt("fair:color", color); } @Override @@ -791,10 +791,10 @@ public class FragmentIdentity extends FragmentBase { } }.execute(FragmentIdentity.this, new Bundle(), "identity:count"); } else { - auth_type = savedInstanceState.getInt("auth_type"); - tilPassword.getEditText().setText(savedInstanceState.getString("password")); - grpAdvanced.setVisibility(savedInstanceState.getInt("advanced")); - color = savedInstanceState.getInt("color"); + auth_type = savedInstanceState.getInt("fair:auth_type"); + tilPassword.getEditText().setText(savedInstanceState.getString("fair:password")); + grpAdvanced.setVisibility(savedInstanceState.getInt("fair:advanced")); + color = savedInstanceState.getInt("fair:color"); } Helper.setViewsEnabled(view, true); @@ -865,11 +865,11 @@ public class FragmentIdentity extends FragmentBase { } } } else { - int provider = savedInstanceState.getInt("provider"); + int provider = savedInstanceState.getInt("fair:provider"); spProvider.setTag(provider); spProvider.setSelection(provider); - int account = savedInstanceState.getInt("account"); + int account = savedInstanceState.getInt("fair:account"); spAccount.setTag(account); spAccount.setSelection(account); } diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 5ee1364f96..dc5e7d41e8 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1431,16 +1431,16 @@ public class FragmentMessages extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putBoolean("autoExpanded", autoExpanded); - outState.putInt("autoCloseCount", autoCloseCount); + outState.putBoolean("fair:autoExpanded", autoExpanded); + outState.putInt("fair:autoCloseCount", autoCloseCount); - outState.putStringArray("values", values.keySet().toArray(new String[0])); + outState.putStringArray("fair:values", values.keySet().toArray(new String[0])); for (String name : values.keySet()) - outState.putLongArray(name, Helper.toLongArray(values.get(name))); + outState.putLongArray("fair:name:" + name, Helper.toLongArray(values.get(name))); if (rvMessage != null) { Parcelable rv = rvMessage.getLayoutManager().onSaveInstanceState(); - outState.putParcelable("rv", rv); + outState.putParcelable("fair:rv", rv); } if (selectionTracker != null) @@ -1452,18 +1452,18 @@ public class FragmentMessages extends FragmentBase { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { - autoExpanded = savedInstanceState.getBoolean("autoExpanded"); - autoCloseCount = savedInstanceState.getInt("autoCloseCount"); + autoExpanded = savedInstanceState.getBoolean("fair:autoExpanded"); + autoCloseCount = savedInstanceState.getInt("fair:autoCloseCount"); - String[] names = savedInstanceState.getStringArray("values"); + String[] names = savedInstanceState.getStringArray("fair:values"); for (String name : names) { values.put(name, new ArrayList()); - for (Long value : savedInstanceState.getLongArray(name)) + for (Long value : savedInstanceState.getLongArray("fair:name:" + name)) values.get(name).add(value); } if (rvMessage != null) { - Parcelable rv = savedInstanceState.getBundle("rv"); + Parcelable rv = savedInstanceState.getBundle("fair:rv"); rvMessage.getLayoutManager().onRestoreInstanceState(rv); }