diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-21 09:19:26 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-21 09:19:26 +0200 |
| commit | 75977818eadd07c6a0adcd41f9af137faaf86349 (patch) | |
| tree | 675bd5a450a26dc314d4a2ce995e87951642eb89 | |
| parent | 2364710afb345dfd797a1832c25b134fd34b0e29 (diff) | |
| parent | 82d4c3b21fd9ed6131ce97929013567f5756a9be (diff) | |
Merge branch 'master' into development
Diffstat (limited to '')
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index 635da8f8..1515467a 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 21 - versionCode 68 + versionCode 69 versionName "1.5.0-alpha" } diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 1b5e5178..d9f56c5d 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()); } } |