be more carefull with pending uris

1 files changed, 16 insertions, 8 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 23463792b..a26333d33 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1053,6 +1053,7 @@ public class ConversationActivity extends XmppActivity
         if (xmppConnectionServiceBound) {
             if (intent != null && VIEW_CONVERSATION.equals(intent.getType())) {
                 handleViewConversationIntent(intent);
+                setIntent(new Intent());
             }
         } else {
             setIntent(intent);
@@ -1105,17 +1106,26 @@ public class ConversationActivity extends XmppActivity
     public void onSaveInstanceState(final Bundle savedInstanceState) {
         Conversation conversation = getSelectedConversation();
         if (conversation != null) {
-            savedInstanceState.putString(STATE_OPEN_CONVERSATION,
-                    conversation.getUuid());
+            savedInstanceState.putString(STATE_OPEN_CONVERSATION, conversation.getUuid());
+        } else {
+            savedInstanceState.remove(STATE_OPEN_CONVERSATION);
         }
-        savedInstanceState.putBoolean(STATE_PANEL_OPEN,
-                isConversationsOverviewVisable());
+        savedInstanceState.putBoolean(STATE_PANEL_OPEN, isConversationsOverviewVisable());
         if (this.mPendingImageUris.size() >= 1) {
             savedInstanceState.putString(STATE_PENDING_URI, this.mPendingImageUris.get(0).toString());
+        } else {
+            savedInstanceState.remove(STATE_PENDING_URI);
         }
         super.onSaveInstanceState(savedInstanceState);
     }
 
+    private void clearPending() {
+        mPendingImageUris.clear();
+        mPendingFileUris.clear();
+        mPendingGeoUri = null;
+        mPostponedActivityResult = null;
+    }
+
     @Override
     void onBackendConnected() {
         this.xmppConnectionService.getNotificationService().setIsInForeground(true);
@@ -1143,6 +1153,7 @@ public class ConversationActivity extends XmppActivity
                 finish();
             }
         } else if (getIntent() != null && VIEW_CONVERSATION.equals(getIntent().getType())) {
+        		clearPending();
             handleViewConversationIntent(getIntent());
         } else if (selectConversationByUuid(mOpenConverstaion)) {
             if (mPanelOpen) {
@@ -1156,11 +1167,8 @@ public class ConversationActivity extends XmppActivity
             mOpenConverstaion = null;
         } else if (getSelectedConversation() == null) {
             showConversationsOverview();
-            mPendingImageUris.clear();
-            mPendingFileUris.clear();
-            mPendingGeoUri = null;
+            clearPending();
             setSelectedConversation(conversationList.get(0));
-            mPostponedActivityResult = null;
             this.mConversationFragment.reInit(getSelectedConversation());
         } else {
             this.mConversationFragment.messageListAdapter.updatePreferences();