aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java6
-rw-r--r--src/main/res/drawable-hdpi/ic_action_secure.pngbin263 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_action_secure.pngbin210 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_action_secure.pngbin323 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_action_secure.pngbin445 -> 0 bytes
5 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index aeebcb44a..d39a6ff94 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -518,11 +518,7 @@ public class ConversationActivity extends XmppActivity
menuArchiveChat.setVisible(false);
}
if (this.getSelectedConversation().getNextEncryption() != Message.ENCRYPTION_NONE) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
- } else {
- menuSecure.setIcon(R.drawable.ic_action_secure);
- }
+ menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
}
if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
menuAttach.setVisible(getSelectedConversation().getAccount().httpUploadAvailable() && getSelectedConversation().getMucOptions().participating());
diff --git a/src/main/res/drawable-hdpi/ic_action_secure.png b/src/main/res/drawable-hdpi/ic_action_secure.png
deleted file mode 100644
index e066ba4dc..000000000
--- a/src/main/res/drawable-hdpi/ic_action_secure.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_action_secure.png b/src/main/res/drawable-mdpi/ic_action_secure.png
deleted file mode 100644
index fcb585f6f..000000000
--- a/src/main/res/drawable-mdpi/ic_action_secure.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_secure.png b/src/main/res/drawable-xhdpi/ic_action_secure.png
deleted file mode 100644
index 05b6acc74..000000000
--- a/src/main/res/drawable-xhdpi/ic_action_secure.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png
deleted file mode 100644
index 76e1190d6..000000000
--- a/src/main/res/drawable-xxhdpi/ic_action_secure.png
+++ /dev/null
Binary files differ