diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-23 13:07:20 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-23 13:07:20 +0100 |
commit | 64049eb335ef0fe2d0b39340f8e482962e7dc9ad (patch) | |
tree | 0758d72915438c0e06ebd74b9ef935f59087b9bc /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
parent | 0c22f68aef5dd44caebf930b684979ecac0a35d2 (diff) |
Removed unnecessary dependencies to XmppConnectionService and added allowMessageCorrection to preferences
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 9da9ffb2..4c9cac69 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1488,7 +1488,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa databaseBackend.deleteAccount(account); } }; - mDatabaseExecutor.execute(runnable); + ConversationsPlusApplication.executeDatabaseOperation(runnable); this.accounts.remove(account); updateAccountUi(); getNotificationService().updateErrorNotification(); @@ -2176,9 +2176,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa final Account account = conversation.getAccount(); final Session otrSession = conversation.getOtrSession(); Logging.d(Config.LOGTAG, - account.getJid().toBareJid() + " otr session established with " - + conversation.getJid() + "/" - + otrSession.getSessionID().getUserID()); + account.getJid().toBareJid() + " otr session established with " + + conversation.getJid() + "/" + + otrSession.getSessionID().getUserID()); conversation.findUnsentMessagesWithEncryption(Message.ENCRYPTION_OTR, new Conversation.OnMessageFound() { @Override @@ -2393,14 +2393,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa return getPreferences().getBoolean("confirm_messages", true); } - public boolean allowMessageCorrection() { - return getPreferences().getBoolean("allow_message_correction", true); - } - - public boolean sendChatStates() { - return getPreferences().getBoolean("chat_states", false); - } - public boolean saveEncryptedMessages() { return !getPreferences().getBoolean("dont_save_encrypted", false); } @@ -2409,10 +2401,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa return getPreferences().getBoolean("autojoin", true); } - public boolean indicateReceived() { - return getPreferences().getBoolean("indicate_received", false); - } - public boolean useTorToConnect() { return Config.FORCE_ORBOT || getPreferences().getBoolean("use_tor", false); } |