Merge branch 'develop'3.26.0

1 files changed, 6 insertions, 0 deletions

diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java
index 7d9390c7e..a166587f6 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java
@@ -113,6 +113,12 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
         }
     }
 
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.clear();
+    }
+
     private void loadLocalConversation() {
         Bundle bundle = new Bundle();
         bundle.putSerializable(Helper.ARG_STATUS, focusedStatus);