Small fix

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

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

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

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

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

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

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

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

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

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

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