aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-05-21 09:19:26 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-05-21 09:19:26 +0200
commit75977818eadd07c6a0adcd41f9af137faaf86349 (patch)
tree675bd5a450a26dc314d4a2ce995e87951642eb89 /src
parent2364710afb345dfd797a1832c25b134fd34b0e29 (diff)
parent82d4c3b21fd9ed6131ce97929013567f5756a9be (diff)
Merge branch 'master' into development
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java2
1 files changed, 1 insertions, 1 deletions
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());
}
}