aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-05-21 05:21:22 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-05-21 05:21:22 +0200
commit3cdac228f902978f71839b7c2ae6c1d1b15edd5b (patch)
treefc0e3a0393af37abbdd61035281dd4d23aa16b3e /src
parent8064832dcaf9098ed7748fbdf3e21f3f6734cd28 (diff)
fixed with attaching wrong files when returning to activity and background service is still alive
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());
}
}