From 538be96e61f5b6c2c39b02ed2f1550a1a6a9a2c9 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 15 Mar 2015 21:41:04 +0100
Subject: work on certification ui

---
 .../sufficientlysecure/keychain/pgp/linked/LinkedResource.java   | 3 +++
 .../keychain/pgp/linked/resources/DnsResource.java               | 7 +++++++
 .../keychain/pgp/linked/resources/GenericHttpsResource.java      | 9 +++++++++
 .../keychain/pgp/linked/resources/TwitterResource.java           | 7 +++++++
 4 files changed, 26 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java
index e954a514c..f91a24d57 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java
@@ -15,6 +15,8 @@ import java.util.regex.Pattern;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
+
 
 public abstract class LinkedResource {
 
@@ -102,6 +104,7 @@ public abstract class LinkedResource {
     }
 
     public abstract @DrawableRes int getDisplayIcon();
+    public abstract @StringRes int getVerifiedText();
     public abstract String getDisplayTitle(Context context);
     public abstract String getDisplayComment(Context context);
     public boolean isViewable() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
index 253e611a8..21c3a3eef 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java
@@ -2,6 +2,7 @@ package org.sufficientlysecure.keychain.pgp.linked.resources;
 
 import android.content.Context;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
@@ -103,6 +104,12 @@ public class DnsResource extends LinkedCookieResource {
         return magicPattern.matcher(res);
     }
 
+    @Override
+    public @StringRes
+    int getVerifiedText() {
+        return R.string.linked_verified_dns;
+    }
+
     @Override
     public @DrawableRes int getDisplayIcon() {
         return R.drawable.dns;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java
index 1e872c6cb..c6d5883ee 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
 
 import com.textuality.keybase.lib.Search;
 
@@ -81,6 +82,8 @@ public class GenericHttpsResource extends LinkedCookieResource {
             log.add(LogType.MSG_LV_FETCH_ERROR_URL, indent);
             return null;
         } catch (IOException e) {
+            Log.e(Constants.TAG, "io error", e);
+            e.printStackTrace();
             log.add(LogType.MSG_LV_FETCH_ERROR_IO, indent);
             return null;
         }
@@ -109,6 +112,12 @@ public class GenericHttpsResource extends LinkedCookieResource {
         return R.drawable.ssl_lock;
     }
 
+    @Override
+    public @StringRes
+    int getVerifiedText() {
+        return R.string.linked_verified_https;
+    }
+
     @Override
     public String getDisplayTitle(Context context) {
         return "Website (HTTPS)";
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java
index 32bf92a99..8bc872f51 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
 import android.util.Log;
 
 import com.textuality.keybase.lib.JWalk;
@@ -118,6 +119,12 @@ public class TwitterResource extends LinkedCookieResource {
         return R.drawable.twitter;
     }
 
+    @Override
+    public @StringRes
+    int getVerifiedText() {
+        return R.string.linked_verified_twitter;
+    }
+
     @Override
     public String getDisplayTitle(Context context) {
         return "Twitter";
-- 
cgit v1.2.3