aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/utils/UIHelper.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-13 18:09:40 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-13 18:09:40 +0200
commit7dfe4ae0823238da216088f80de40b9ff6b1446d (patch)
tree59bbc5457190b465ff9b5f653cec139198f37faa /src/eu/siacs/conversations/utils/UIHelper.java
parent27d5966ac356fd10365d848332b127b0b8f417da (diff)
some code cleanup. added setting to auto accept files. socks5 connections are now threaded
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/utils/UIHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index fbac8c7fc..312f42b35 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -419,7 +419,7 @@ public class UIHelper {
mBuilder.setContentText(names.toString());
mBuilder.setStyle(style);
}
- if (currentCon!=null) {
+ if ((currentCon!=null)&&(notify)) {
targetUuid=currentCon.getUuid();
}
if (unread.size() != 0) {