From ce6a4041fd7e8ff0b4368b4792fb922bdf45f630 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 10 Apr 2014 15:34:08 +0200
Subject: ViewCertActivity cleanup

Closes #547
---
 .../sufficientlysecure/keychain/ui/ViewCertActivity.java  | 11 +++++------
 OpenKeychain/src/main/res/layout/view_cert_activity.xml   | 15 ++++++---------
 OpenKeychain/src/main/res/values/strings.xml              |  8 ++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
index 7abc49c32..155e653b4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
@@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
@@ -157,21 +156,21 @@ public class ViewCertActivity extends ActionBarActivity
                     sig.init(new JcaPGPContentVerifierBuilderProvider().setProvider(
                             Constants.BOUNCY_CASTLE_PROVIDER_NAME), signerRing.getPublicKey());
                     if (sig.verifyCertification(signeeUid, signeeRing.getPublicKey())) {
-                        mStatus.setText("ok");
+                        mStatus.setText(R.string.cert_verify_ok);
                         mStatus.setTextColor(getResources().getColor(R.color.bbutton_success));
                     } else {
-                        mStatus.setText("failed!");
+                        mStatus.setText(R.string.cert_verify_failed);
                         mStatus.setTextColor(getResources().getColor(R.color.alert));
                     }
                 } catch (SignatureException e) {
-                    mStatus.setText("error!");
+                    mStatus.setText(R.string.cert_verify_error);
                     mStatus.setTextColor(getResources().getColor(R.color.alert));
                 } catch (PGPException e) {
-                    mStatus.setText("error!");
+                    mStatus.setText(R.string.cert_verify_error);
                     mStatus.setTextColor(getResources().getColor(R.color.alert));
                 }
             } catch (ProviderHelper.NotFoundException e) {
-                mStatus.setText("key unavailable");
+                mStatus.setText(R.string.cert_verify_unavailable);
                 mStatus.setTextColor(getResources().getColor(R.color.black));
             }
 
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index adb673d1f..76bf91757 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -1,5 +1,4 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -24,12 +23,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Verification Status" />
+                android:text="@string/label_verify_status" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="ok"
+                android:text="@string/cert_verify_ok"
                 android:id="@+id/status"
                 android:layout_marginLeft="30dp" />
         </LinearLayout>
@@ -108,7 +107,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:paddingRight="10dip"
-                    android:text="Type" />
+                    android:text="@string/label_cert_type" />
 
                 <TextView
                     android:id="@+id/signature_type"
@@ -127,7 +126,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:paddingRight="10dip"
-                    android:text="Revocation Reason" />
+                    android:text="@string/label_revocation" />
 
                 <TextView
                     android:id="@+id/reason"
@@ -143,7 +142,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:paddingRight="10dip"
-                    android:text="Creation" />
+                    android:text="@string/label_creation" />
 
                 <TextView
                     android:id="@+id/creation"
@@ -182,7 +181,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="5dip"
-                    android:text=""
                     android:typeface="monospace" />
             </TableRow>
 
@@ -200,8 +198,7 @@
                     android:id="@+id/signer_uid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="" />
+                    android:paddingRight="5dip"/>
             </TableRow>
 
         </TableLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d0959f255..ecc57de49 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -515,5 +515,13 @@
     <string name="cert_positive">positive</string>
     <string name="cert_revoke">revoke</string>
     <string name="never">never</string>
+    <string name="help_tab_wot">Web of Trust</string>
+    <string name="cert_verify_ok">ok</string>
+    <string name="cert_verify_failed">failed!</string>
+    <string name="cert_verify_error">error!</string>
+    <string name="cert_verify_unavailable">key unavailable</string>
+    <string name="label_revocation">Revocation Reason</string>
+    <string name="label_verify_status">Verification Status</string>
+    <string name="label_cert_type">Type</string>
 
 </resources>
-- 
cgit v1.2.3