From acd8603ee3389a99f23f648e3b537cd9b33a915b Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Tue, 10 Nov 2020 15:16:01 +1100
Subject: [PATCH] Open group avatar downloading disabled. Open group message
 delete request error logs go to the warning channel now.

---
 .../conversation/ConversationActivity.java          | 13 +++++++------
 .../conversation/ConversationFragment.java          |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 465de91e5f..d333059dd2 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -466,12 +466,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       publicChatAPI.getChannelInfo(publicChat.getChannel(), publicChat.getServer()).success(info -> {
         String groupId = GroupUtil.getEncodedOpenGroupId(publicChat.getId().getBytes());
 
-        publicChatAPI.updateProfileIfNeeded(
-            publicChat.getChannel(),
-            publicChat.getServer(),
-            groupId,
-            info,
-            false);
+        //TODO Use same approach as in PublicChatManager#addChat()
+//        publicChatAPI.updateProfileIfNeeded(
+//            publicChat.getChannel(),
+//            publicChat.getServer(),
+//            groupId,
+//            info,
+//            false);
 
         runOnUiThread(ConversationActivity.this::updateSubtitleTextView);
         return Unit.INSTANCE;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index e8a766f0e4..d260dcb0c6 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -548,12 +548,12 @@ public class ConversationFragment extends Fragment
                       }
                     } else if (!ignoredMessages.contains(serverID)) {
                       failedMessages.add(messageRecord.getId());
-                      Log.d("Loki", "Failed to delete message: " + messageRecord.getId() + ".");
+                      Log.w("Loki", "Failed to delete message: " + messageRecord.getId() + ".");
                     }
                   }
                   return null;
                 }). fail(e -> {
-                  Log.d("Loki", "Couldn't delete message due to error: " + e.toString() + ".");
+                  Log.w("Loki", "Couldn't delete message due to error: " + e.toString() + ".");
                   return null;
                 });
               }