Merge branch 'master' into development

Daniel Gultsch created 10 years ago

Change summary

build.gradle                                                      | 2 
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 
2 files changed, 2 insertions(+), 2 deletions(-)

Detailed changes

build.gradle

@@ -45,7 +45,7 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 68
+		versionCode 69
 		versionName "1.5.0-alpha"
 	}
 

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());
 					}
 				}