sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
Daniel Gultsch 2015-05-21 09:19:26 +02:00
parent 2364710afb 82d4c3b21f
commit 75977818ea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

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

2
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -1039,7 +1039,7 @@ public class ConversationActivity extends XmppActivity
mPendingFileUris.clear(); mPendingFileUris.clear();
mPendingFileUris.addAll(extractUriFromIntent(data)); mPendingFileUris.addAll(extractUriFromIntent(data));
if (xmppConnectionServiceBound) { 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()); attachFileToConversation(getSelectedConversation(), i.next());
} }
} }