From 7a58605d50438cdb07ef85dd298776515816b442 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 11 Apr 2019 19:30:39 +0200 Subject: [PATCH] Small fix --- app/src/main/java/eu/faircode/email/ActivityBase.java | 2 +- app/src/main/java/eu/faircode/email/ActivitySetup.java | 2 +- app/src/main/java/eu/faircode/email/ActivityView.java | 2 +- app/src/main/java/eu/faircode/email/FragmentAccount.java | 2 +- app/src/main/java/eu/faircode/email/FragmentAccounts.java | 3 +-- app/src/main/java/eu/faircode/email/FragmentBase.java | 7 +++---- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- app/src/main/java/eu/faircode/email/FragmentContacts.java | 2 +- app/src/main/java/eu/faircode/email/FragmentFolders.java | 4 ++-- app/src/main/java/eu/faircode/email/FragmentIdentity.java | 2 +- app/src/main/java/eu/faircode/email/FragmentMessages.java | 4 ++-- 11 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index c53c3fa206..638a94efa1 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -75,7 +75,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc int after = Helper.getSize(outState); Log.i("Saved instance " + this + " size=" + before + "/" + after); for (String key : outState.keySet()) - Log.i("Saved " + key + "=" + outState.get(key)); + Log.i("Saved " + this + " " + key + "=" + outState.get(key)); } @Override diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 23224953c3..c53cc70dcf 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -240,8 +240,8 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On @Override protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled()); + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 5ae92dd93b..c40ee9a3ce 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -549,8 +549,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB @Override protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled()); + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 142fee00d8..c9fef90a6e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -1073,12 +1073,12 @@ public class FragmentAccount extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); 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); + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java index 35991d9ba0..b82d49a47c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java @@ -169,9 +169,8 @@ public class FragmentAccounts extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putString("fair:searching", searching); + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java index 5b7f2f03ab..1eee675a60 100644 --- a/app/src/main/java/eu/faircode/email/FragmentBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentBase.java @@ -55,14 +55,13 @@ public class FragmentBase extends Fragment { @Override public void onSaveInstanceState(Bundle outState) { Log.i("Save instance " + this); - int base = Helper.getSize(outState); - super.onSaveInstanceState(outState); int before = Helper.getSize(outState); outState.putString("fair:subtitle", subtitle); + super.onSaveInstanceState(outState); int after = Helper.getSize(outState); - Log.i("Saved instance " + this + " base=" + base + " size=" + before + "/" + after); + Log.i("Saved instance " + this + " size=" + before + "/" + after); for (String key : outState.keySet()) - Log.i("Saved " + key + "=" + outState.get(key)); + Log.i("Saved " + this + " " + key + "=" + outState.get(key)); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 2d76159cb9..5df928a94d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -617,9 +617,9 @@ public class FragmentCompose extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); outState.putLong("fair:working", working); outState.putBoolean("fair:show_images", show_images); + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java index 134327a72d..f4819da954 100644 --- a/app/src/main/java/eu/faircode/email/FragmentContacts.java +++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java @@ -84,8 +84,8 @@ public class FragmentContacts extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); outState.putString("fair:searching", searching); + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index 960bdd57da..9899eec619 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -220,8 +220,6 @@ public class FragmentFolders extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putString("fair:searching", searching); outState.putLongArray("fair:parents", Helper.toLongArray(parentChilds.keySet())); @@ -231,6 +229,8 @@ public class FragmentFolders extends FragmentBase { for (int i = 0; i < childs.size(); i++) outState.putSerializable("fair:childs:" + parent + ":" + i, childs.get(i)); } + + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index fdc072972d..1048e7a046 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -740,13 +740,13 @@ public class FragmentIdentity extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); 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); + super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 8362db0b2f..743ff2d8ef 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1620,8 +1620,6 @@ public class FragmentMessages extends FragmentBase { @Override public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putString("fair:searching", searching); outState.putBoolean("fair:autoExpanded", autoExpanded); @@ -1648,6 +1646,8 @@ public class FragmentMessages extends FragmentBase { if (selectionTracker != null) selectionTracker.onSaveInstanceState(outState); + + super.onSaveInstanceState(outState); } @Override