diff options
| author | Christian S <christian@pix-art.de> | 2016-01-31 16:55:36 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-31 16:55:36 +0100 |
| commit | 8986a10bc416651828ce6734933a0ed82574f13f (patch) | |
| tree | cebd8d57eccf8394f9bb1a81162814e5a7b4159d /src/main/java/eu/siacs/conversations/services | |
| parent | 0196442c37d5d172ba75986495977bf16f3095dc (diff) | |
| parent | 19c2ca520c703576bfbf68626051fe5faab6362f (diff) | |
Merge branch 'siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index a295b2cee..d4fda1b86 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1969,7 +1969,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } } } - Element form = query.findChild("x","jabber:x:data"); + Element form = query.findChild("x", "jabber:x:data"); if (form != null) { conversation.getMucOptions().updateFormData(Data.parse(form)); } @@ -2378,7 +2378,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa updateConversationUi(); updateRosterUi(); } else { - Conversation conversation = find(account,avatar.owner.toBareJid()); + Conversation conversation = find(account, avatar.owner.toBareJid()); if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) { MucOptions.User user = conversation.getMucOptions().findUser(avatar.owner.getResourcepart()); if (user != null) { @@ -2586,6 +2586,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa return Config.FORCE_ORBOT || getPreferences().getBoolean("use_tor", false); } + public boolean showExtendedConnectionOptions() { + return getPreferences().getBoolean("show_connection_options", false); + } + public int unreadCount() { int count = 0; for (Conversation conversation : getConversations()) { |