From 3cdac228f902978f71839b7c2ae6c1d1b15edd5b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 21 May 2015 05:21:22 +0200
Subject: [PATCH 1/2] fixed with attaching wrong files when returning to
 activity and background service is still alive

---
 .../java/eu/siacs/conversations/ui/ConversationActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 1b5e51781..d9f56c5db 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1039,7 +1039,7 @@ public class ConversationActivity extends XmppActivity
 				mPendingFileUris.clear();
 				mPendingFileUris.addAll(extractUriFromIntent(data));
 				if (xmppConnectionServiceBound) {
-					for(Iterator<Uri> i = mPendingImageUris.iterator(); i.hasNext(); i.remove()) {
+					for(Iterator<Uri> i = mPendingFileUris.iterator(); i.hasNext(); i.remove()) {
 						attachFileToConversation(getSelectedConversation(), i.next());
 					}
 				}

From 82d4c3b21fd9ed6131ce97929013567f5756a9be Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 21 May 2015 05:21:52 +0200
Subject: [PATCH 2/2] version bump to 1.4.2

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d572892d6..ef3b50eaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 67
-		versionName "1.4.1"
+		versionCode 68
+		versionName "1.4.2"
 	}
 
 	compileOptions {