From 61bb0b682ddbca7cad006622e7811162a1fb4f5b Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 19 Sep 2016 22:03:40 +0200
Subject: fix bug while sending photos directly

---
 .../de/pixart/messenger/ui/ConversationActivity.java  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 935b245a4..4ee5aab59 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -208,6 +208,8 @@ public class ConversationActivity extends XmppActivity
 			if (pending != null) {
 				mPendingImageUris.clear();
 				mPendingImageUris.add(Uri.parse(pending));
+                mPendingPhotoUris.clear();
+                mPendingPhotoUris.add(Uri.parse(pending));
 			}
 		}
 
@@ -1345,8 +1347,10 @@ public class ConversationActivity extends XmppActivity
 		}
 		savedInstanceState.putBoolean(STATE_PANEL_OPEN, isConversationsOverviewVisable());
 		if (this.mPendingImageUris.size() >= 1) {
-			savedInstanceState.putString(STATE_PENDING_URI, this.mPendingImageUris.get(0).toString());
-		} else {
+            savedInstanceState.putString(STATE_PENDING_URI, this.mPendingImageUris.get(0).toString());
+        } else if (this.mPendingPhotoUris.size() >= 1) {
+            savedInstanceState.putString(STATE_PENDING_URI, this.mPendingPhotoUris.get(0).toString());
+        } else {
 			savedInstanceState.remove(STATE_PENDING_URI);
 		}
 		super.onSaveInstanceState(savedInstanceState);
@@ -1664,17 +1668,17 @@ public class ConversationActivity extends XmppActivity
                     selectPresence(c, callback);
                 }
 			} else if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO) {
-				if (mPendingImageUris.size() == 1) {
-					Uri uri = mPendingImageUris.get(0);
+				if (mPendingPhotoUris.size() == 1) {
+					Uri uri = mPendingPhotoUris.get(0);
 					if (xmppConnectionServiceBound) {
-						attachImagesToConversation(getSelectedConversation(), uri);
-						mPendingImageUris.clear();
+						attachPhotoToConversation(getSelectedConversation(), uri);
+						mPendingPhotoUris.clear();
 					}
 					Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
 					intent.setData(uri);
 					sendBroadcast(intent);
 				} else {
-					mPendingImageUris.clear();
+					mPendingPhotoUris.clear();
 				}
             } else if (requestCode == ATTACHMENT_CHOICE_LOCATION) {
 				double latitude = data.getDoubleExtra("latitude", 0);
@@ -1697,6 +1701,7 @@ public class ConversationActivity extends XmppActivity
 		} else {
 			mPendingImageUris.clear();
 			mPendingFileUris.clear();
+            mPendingPhotoUris.clear();
 			if (requestCode == ConversationActivity.REQUEST_DECRYPT_PGP) {
 				mConversationFragment.onActivityResult(requestCode, resultCode, data);
 			}
-- 
cgit v1.2.3