From bdd23a5ff2d1d1e82a83f72c7889db33376ae50f Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 8 Apr 2018 21:05:15 +0200
Subject: offer a more convienient way to disable omemo from trust keys dialog

---
 .../java/de/pixart/messenger/ui/ConversationFragment.java   | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index ddf7d6644..70f88b227 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -910,11 +910,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 break;
             case Message.ENCRYPTION_AXOLOTL:
                 if (!trustKeysIfNeeded(REQUEST_TRUST_KEYS_TEXT)) {
-                    sendAxolotlMessage(message);
+                    sendMessage(message);
                 }
                 break;
             default:
-                sendPlainTextMessage(message);
+                sendMessage(message);
         }
     }
 
@@ -987,7 +987,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             case REQUEST_TRUST_KEYS_TEXT:
                 final String body = binding.textinput.getText().toString();
                 Message message = new Message(conversation, body, conversation.getNextEncryption());
-                sendAxolotlMessage(message);
+                sendMessage(message);
                 break;
             case REQUEST_TRUST_KEYS_MENU:
                 int choice = data.getIntExtra("choice", ATTACHMENT_CHOICE_INVALID);
@@ -2578,7 +2578,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         return this.binding.searchfield.getVisibility() == View.VISIBLE;
     }
 
-    protected void sendPlainTextMessage(Message message) {
+    protected void sendMessage(Message message) {
         activity.xmppConnectionService.sendMessage(message);
         messageSent();
     }
@@ -2697,11 +2697,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         builder.create().show();
     }
 
-    protected void sendAxolotlMessage(final Message message) {
-        activity.xmppConnectionService.sendMessage(message);
-        messageSent();
-    }
-
     protected void sendOtrMessage(final Message message) {
         final ConversationsActivity activity = (ConversationsActivity) getActivity();
         final XmppConnectionService xmppService = activity.xmppConnectionService;
-- 
cgit v1.2.3