From 542e0733cb267e165fa02d00e58fa46c61612548 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 25 Apr 2017 16:25:59 +0200
Subject: [PATCH] remove revoke/expired/insecure status text from toolbar

---
 .../keychain/ui/ViewKeyActivity.java          | 23 ++++++++++++-------
 OpenKeychain/src/main/res/values/strings.xml  |  4 ----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 361c2dd24..1c2bf024f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -966,10 +966,24 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
                                 }
                             };
 
+                    boolean showStatusText = mIsSecure && !mIsExpired && !mIsRevoked;
+                    if (showStatusText) {
+                        mStatusText.setVisibility(View.VISIBLE);
+
+                        if (mIsSecret) {
+                            mStatusText.setText(R.string.view_key_my_key);
+                        } else if (mIsVerified) {
+                            mStatusText.setText(R.string.view_key_verified);
+                        } else {
+                            mStatusText.setText(R.string.view_key_unverified);
+                        }
+                    } else {
+                        mStatusText.setVisibility(View.GONE);
+                    }
+
                     // Note: order is important
                     int color;
                     if (mIsRevoked) {
-                        mStatusText.setText(R.string.view_key_revoked);
                         mStatusImage.setVisibility(View.VISIBLE);
                         KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
                                 State.REVOKED, R.color.icons, true);
@@ -982,7 +996,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
                         hideFab();
                         mQrCodeLayout.setVisibility(View.GONE);
                     } else if (!mIsSecure) {
-                        mStatusText.setText(R.string.view_key_insecure);
                         mStatusImage.setVisibility(View.VISIBLE);
                         KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
                                 State.INSECURE, R.color.icons, true);
@@ -995,11 +1008,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
                         hideFab();
                         mQrCodeLayout.setVisibility(View.GONE);
                     } else if (mIsExpired) {
-                        if (mIsSecret) {
-                            mStatusText.setText(R.string.view_key_expired_secret);
-                        } else {
-                            mStatusText.setText(R.string.view_key_expired);
-                        }
                         mStatusImage.setVisibility(View.VISIBLE);
                         KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
                                 State.EXPIRED, R.color.icons, true);
@@ -1012,7 +1020,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
                         hideFab();
                         mQrCodeLayout.setVisibility(View.GONE);
                     } else if (mIsSecret) {
-                        mStatusText.setText(R.string.view_key_my_key);
                         mStatusImage.setVisibility(View.GONE);
                         // noinspection deprecation, fix requires api level 23
                         color = getResources().getColor(R.color.key_flag_green);
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f0881835d..e3de6deca 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -823,10 +823,6 @@
     <string name="create_key_yubi_key_algorithm_auth_text">Authentication key</string>
 
     <!-- View key -->
-    <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
-    <string name="view_key_insecure">"Insecure: Key must not be used anymore!"</string>
-    <string name="view_key_expired">"Expired: The contact needs to extend the key's validity!"</string>
-    <string name="view_key_expired_secret">"Expired: You can extend the keys validity by editing it!"</string>
     <string name="view_key_my_key">"My Key"</string>
     <string name="view_key_verified">"Confirmed Key"</string>
     <string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string>