From 66d4cb0c018463e3e83dfc041c2c888ade95f782 Mon Sep 17 00:00:00 2001
From: n8fr8 <nathan@freitas.net>
Date: Fri, 25 May 2018 00:10:18 -0400
Subject: [PATCH] don't enable OTR manually; only if OMEMO is not available -
 also don't update the "warning view" so much

---
 .../org/awesomeapp/messenger/ui/ConversationView.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/awesomeapp/messenger/ui/ConversationView.java b/app/src/main/java/org/awesomeapp/messenger/ui/ConversationView.java
index 514d1e61a..636e796c5 100644
--- a/app/src/main/java/org/awesomeapp/messenger/ui/ConversationView.java
+++ b/app/src/main/java/org/awesomeapp/messenger/ui/ConversationView.java
@@ -434,6 +434,7 @@ private boolean checkConnection ()
 
     }
 
+    /**
     public void setOTRState(boolean otrEnabled) {
         
         try {
@@ -473,7 +474,7 @@ public void setOTRState(boolean otrEnabled) {
         }
 
 
-    }
+    }**/
 
 
 
@@ -1901,7 +1902,7 @@ void requeryCursor() {
 
         mMessageAdapter.notifyDataSetChanged();
         mLoaderManager.restartLoader(loaderId++, null, new MyLoaderCallbacks());
-        updateWarningView();
+//        updateWarningView();
 
         /**
         if (mMessageAdapter.isScrolling()) {
@@ -1928,7 +1929,6 @@ public void closeChatSession(boolean doDelete) {
         if (getChatSession() != null) {
             try {
 
-                setOTRState(false);
                 updateWarningView();
                 getChatSession().leave();
 
@@ -3469,8 +3469,6 @@ private void startChat (String username)
 
         if (username != null) {
 
-
-
             new ChatSessionInitTask(((ImApp) mActivity.getApplication()), mProviderId, mAccountId, Imps.Contacts.TYPE_NORMAL, true) {
                 @Override
                 protected void onPostExecute(Long chatId) {