From 3edf47c5decdc547724bc84628ddfa25bf8ae53a Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 24 Mar 2015 19:47:54 +0100 Subject: secret/public distinction in LinkedIdView --- .../keychain/pgp/linked/LinkedResource.java | 2 +- .../keychain/pgp/linked/resources/DnsResource.java | 6 +++--- .../keychain/pgp/linked/resources/GenericHttpsResource.java | 13 +++---------- .../keychain/pgp/linked/resources/GithubResource.java | 6 +++--- .../keychain/pgp/linked/resources/TwitterResource.java | 6 +++--- 5 files changed, 13 insertions(+), 20 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp') 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 476d0b21e..5a0fc6e47 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 @@ -109,7 +109,7 @@ public abstract class LinkedResource { } public abstract @DrawableRes int getDisplayIcon(); - public abstract @StringRes int getVerifiedText(); + public abstract @StringRes int getVerifiedText(boolean isSecret); 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 21c3a3eef..368d0f4da 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 @@ -106,8 +106,8 @@ public class DnsResource extends LinkedCookieResource { @Override public @StringRes - int getVerifiedText() { - return R.string.linked_verified_dns; + int getVerifiedText(boolean isSecret) { + return isSecret ? R.string.linked_verified_secret_dns : R.string.linked_verified_dns; } @Override @@ -117,7 +117,7 @@ public class DnsResource extends LinkedCookieResource { @Override public String getDisplayTitle(Context context) { - return "Domain Name"; + return context.getString(R.string.linked_title_dns); } @Override 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 4cf56fe67..597d5aee0 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 @@ -6,26 +6,19 @@ import android.net.Uri; import android.support.annotation.DrawableRes; import android.support.annotation.StringRes; -import com.textuality.keybase.lib.Search; - import org.apache.http.client.methods.HttpGet; -import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; -import org.sufficientlysecure.keychain.util.Log; import java.io.IOException; -import java.net.MalformedURLException; import java.net.URI; -import java.net.URL; import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import javax.net.ssl.HttpsURLConnection; public class GenericHttpsResource extends LinkedCookieResource { @@ -77,13 +70,13 @@ public class GenericHttpsResource extends LinkedCookieResource { @Override public @StringRes - int getVerifiedText() { - return R.string.linked_verified_https; + int getVerifiedText(boolean isSecret) { + return isSecret ? R.string.linked_verified_secret_https : R.string.linked_verified_https; } @Override public String getDisplayTitle(Context context) { - return "Website (HTTPS)"; + return context.getString(R.string.linked_title_https); } @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GithubResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GithubResource.java index 9300b67e7..723898d20 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GithubResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GithubResource.java @@ -187,13 +187,13 @@ public class GithubResource extends LinkedCookieResource { @Override public @StringRes - int getVerifiedText() { - return R.string.linked_verified_github; + int getVerifiedText(boolean isSecret) { + return isSecret ? R.string.linked_verified_secret_github : R.string.linked_verified_github; } @Override public String getDisplayTitle(Context context) { - return "Github"; + return context.getString(R.string.linked_title_github); } @Override 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 e56d281b7..54444ee5e 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 @@ -113,13 +113,13 @@ public class TwitterResource extends LinkedCookieResource { @Override public @StringRes - int getVerifiedText() { - return R.string.linked_verified_twitter; + int getVerifiedText(boolean isSecret) { + return isSecret ? R.string.linked_verified_secret_twitter : R.string.linked_verified_twitter; } @Override public String getDisplayTitle(Context context) { - return "Twitter"; + return context.getString(R.string.linked_title_twitter); } @Override -- cgit v1.2.3