1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index c3ba5620f..061bb7b28 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -114,6 +114,16 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
             getActionBar().setHomeButtonEnabled(true);
             getActionBar().setDisplayHomeAsUpEnabled(true);
         }
+
+        if (savedInstanceState != null) {
+            mUseCameraHintShown.set(savedInstanceState.getBoolean("camera_hint_shown", false));
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        savedInstanceState.putBoolean("camera_hint_shown", mUseCameraHintShown.get());
+        super.onSaveInstanceState(savedInstanceState);
     }
 
     @Override
@@ -313,6 +323,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
             } else {
                 reloadFingerprints();
                 populateView();
+                invalidateOptionsMenu();
             }
         }
     }