From 39de278b7de00b2fe0114ed3631478540cd08362 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 6 May 2021 16:58:19 +0200
Subject: [PATCH] remove lock icon in conversations list

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../nextcloud/talk/adapters/items/ConversationItem.java  | 9 ---------
 app/src/main/res/drawable/shape_lock_bubble.xml          | 2 +-
 .../layout/rv_item_conversation_with_last_message.xml    | 8 --------
 scripts/analysis/findbugs-results.txt                    | 2 +-
 scripts/analysis/lint-results.txt                        | 2 +-
 5 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
index c00aa504e..54c510dca 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
@@ -162,13 +162,6 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
             holder.dialogUnreadBubble.setVisibility(View.GONE);
         }
 
-
-        if (conversation.isHasPassword()) {
-            holder.passwordProtectedRoomImageView.setVisibility(View.VISIBLE);
-        } else {
-            holder.passwordProtectedRoomImageView.setVisibility(View.GONE);
-        }
-
         if (conversation.isFavorite()) {
             holder.pinnedConversationImageView.setVisibility(View.VISIBLE);
         } else {
@@ -286,8 +279,6 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
         EmojiTextView dialogLastMessage;
         @BindView(R.id.dialogUnreadBubble)
         Chip dialogUnreadBubble;
-        @BindView(R.id.passwordProtectedRoomImageView)
-        ImageView passwordProtectedRoomImageView;
         @BindView(R.id.favoriteConversationImageView)
         ImageView pinnedConversationImageView;
 
diff --git a/app/src/main/res/drawable/shape_lock_bubble.xml b/app/src/main/res/drawable/shape_lock_bubble.xml
index 4233ed76a..9d10e9545 100644
--- a/app/src/main/res/drawable/shape_lock_bubble.xml
+++ b/app/src/main/res/drawable/shape_lock_bubble.xml
@@ -23,7 +23,7 @@
     <item>
         <shape
             android:shape="oval">
-            <solid android:color="@color/white"/>
+            <solid android:color="@color/bg_default"/>
         </shape>
     </item>
     <item android:drawable="@drawable/ic_lock_grey600_24px"/>
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index b7cec4675..68e6d3657 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -46,14 +46,6 @@
                 app:roundAsCircle="true"
                 tools:src="@drawable/ic_call_black_24dp" />
 
-            <ImageView
-                android:id="@+id/passwordProtectedRoomImageView"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_gravity="bottom|end"
-                android:background="@drawable/shape_lock_bubble"
-                android:contentDescription="@string/password_protected" />
-
             <ImageView
                 android:id="@+id/favoriteConversationImageView"
                 android:layout_width="16dp"
diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt
index 662106aa4..d9bf67ee8 100644
--- a/scripts/analysis/findbugs-results.txt
+++ b/scripts/analysis/findbugs-results.txt
@@ -1 +1 @@
-485
\ No newline at end of file
+484
\ No newline at end of file
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 21a6df58f..d36a05486 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 3 errors and 348 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 3 errors and 347 warnings</span>