aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-01 16:56:03 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-01 16:56:03 +0200
commit5670a7a735387c4371af1b27aa1e59e927a9a175 (patch)
treee21d0fac3142420fa6d73dee5b1b7043b4af3985 /src/main/java/de/pixart/messenger/ui/ConversationActivity.java
parent9522dcad8ae0c4ad52c9adbf73d6784bc05449e0 (diff)
fixed take photo for activties that do not get destroyed
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index f97d5fb06..1cd1b4e12 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -505,8 +505,8 @@ public class ConversationActivity extends XmppActivity implements OnConversation
@Override
public void onSaveInstanceState(Bundle savedInstanceState) {
- Intent pendingIntent = pendingViewIntent.pop();
- savedInstanceState.putParcelable("intent", pendingIntent == null ? pendingIntent : getIntent());
+ Intent pendingIntent = pendingViewIntent.peek();
+ savedInstanceState.putParcelable("intent", pendingIntent != null ? pendingIntent : getIntent());
super.onSaveInstanceState(savedInstanceState);
}