use verified symbol instead of colored lock icons

9 files changed, 8 insertions, 18 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index 8014ac861..578a2c684 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -218,30 +218,20 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         if (message.getEncryption() == Message.ENCRYPTION_NONE) {
             viewHolder.indicator.setVisibility(View.GONE);
         } else {
-            viewHolder.indicator.setVisibility(View.VISIBLE);
+            boolean verified = false;
             if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
-                FingerprintStatus status = message.getConversation()
+                final FingerprintStatus status = message.getConversation()
                         .getAccount().getAxolotlService().getFingerprintTrust(
                                 message.getFingerprint());
 
-                if(status == null || (type == SENT ? !status.isTrusted() : (!status.isVerified() && inValidSession))) {
-                    viewHolder.indicator.setColorFilter(0xffc64545);
-                    viewHolder.indicator.setAlpha(1.0f);
-                } else {
-                    viewHolder.indicator.clearColorFilter();
-                    if (darkBackground) {
-                        viewHolder.indicator.setAlpha(0.7f);
-                    } else {
-                        viewHolder.indicator.setAlpha(0.57f);
-                    }
+                if (status != null && status.isVerified()) {
+                    verified = true;
                 }
+            }
+            if (verified) {
+                viewHolder.indicator.setImageResource(R.drawable.ic_verified_user_blue_18dp);
             } else {
-                viewHolder.indicator.clearColorFilter();
-                if (darkBackground) {
-                    viewHolder.indicator.setAlpha(0.7f);
-                } else {
-                    viewHolder.indicator.setAlpha(0.57f);
-                }
+                viewHolder.indicator.setImageResource(R.drawable.ic_lock_blue_18dp);
             }
         }
 
diff --git a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
index 587922d98..608fca49d 100644
--- a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png
new file mode 100644
index 000000000..f178bbb29
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png
diff --git a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
index c17b81385..8e20d2a69 100644
--- a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png
new file mode 100644
index 000000000..12dc08721
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
index 6e579cbe4..c21610bd8 100644
--- a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png
new file mode 100644
index 000000000..8a8d4d8f3
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
index ae8fd44df..9101506fa 100644
--- a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
+++ b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png
new file mode 100644
index 000000000..ecb5abc41
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png