From 5f6f552b6b4cd4abbb7281008a0909e0daf53cc1 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 21 Aug 2018 18:00:06 +0000 Subject: [PATCH] Fixes --- app/src/main/java/eu/faircode/email/ActivityBase.java | 6 ++++-- app/src/main/java/eu/faircode/email/FragmentAccount.java | 2 +- app/src/main/java/eu/faircode/email/FragmentCompose.java | 1 + app/src/main/java/eu/faircode/email/FragmentIdentity.java | 2 +- app/src/main/java/eu/faircode/email/FragmentMessage.java | 2 +- app/src/main/java/eu/faircode/email/SimpleTask.java | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index 4cb413c074..0f2313ceed 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -69,8 +69,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { Log.i(Helper.TAG, "Preference " + key + "=" + prefs.getAll().get(key)); - if ("theme".equals(key) || "debug".equals(key)) - recreate(); + if ("theme".equals(key) || "debug".equals(key)) { + finish(); + startActivity(getIntent()); + } } private List backPressedListeners = new ArrayList<>(); diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index dbe3bce27a..3b78b86462 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -587,9 +587,9 @@ public class FragmentAccount extends FragmentEx { @Override public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); outState.putInt("provider", spProvider.getSelectedItemPosition()); outState.putString("password", tilPassword.getEditText().getText().toString()); - super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index bf257c3092..e9ab8cfae9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -311,6 +311,7 @@ public class FragmentCompose extends FragmentEx { @Override public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); if (autosave) onAction(R.id.action_save); outState.putLong("working", working); diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 0ba2d17bda..4a6a4a6618 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -375,10 +375,10 @@ public class FragmentIdentity extends FragmentEx { @Override public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); outState.putInt("account", spAccount.getSelectedItemPosition()); outState.putInt("provider", spProvider.getSelectedItemPosition()); outState.putString("password", tilPassword.getEditText().getText().toString()); - super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java index 90d0a790cb..6375101b3f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessage.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java @@ -291,10 +291,10 @@ public class FragmentMessage extends FragmentEx { @Override public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); outState.putBoolean("free", free); outState.putInt("addresses", grpAddresses.getVisibility()); outState.putInt("attachments", rvAttachment.getVisibility()); - super.onSaveInstanceState(outState); } @Override diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java index 2396849a61..67e234bc40 100644 --- a/app/src/main/java/eu/faircode/email/SimpleTask.java +++ b/app/src/main/java/eu/faircode/email/SimpleTask.java @@ -80,7 +80,7 @@ public abstract class SimpleTask implements LifecycleObserver { @OnLifecycleEvent(Lifecycle.Event.ON_STOP) public void onStop() { - Log.i(Helper.TAG, "Resume tak " + this); + Log.i(Helper.TAG, "Stop task " + this); } @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)