aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java17
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java17
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java20
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/UnknownResource.java21
4 files changed, 54 insertions, 21 deletions
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 d5b8a0345..8f16aa24d 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
@@ -1,7 +1,9 @@
package org.sufficientlysecure.keychain.pgp.linked.resources;
import android.content.Context;
+import android.support.annotation.DrawableRes;
+import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
@@ -100,4 +102,19 @@ public class DnsResource extends LinkedCookieResource {
protected Matcher matchResource(OperationLog log, int indent, String res) {
return magicPattern.matcher(res);
}
+
+ @Override
+ public @DrawableRes int getDisplayIcon() {
+ return R.drawable.dns;
+ }
+
+ @Override
+ public String getDisplayTitle(Context context) {
+ return "dns";
+ }
+
+ @Override
+ public String getDisplayComment(Context context) {
+ return null;
+ }
}
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 ba94bae75..7d4a38fe4 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
@@ -1,6 +1,7 @@
package org.sufficientlysecure.keychain.pgp.linked.resources;
import android.content.Context;
+import android.support.annotation.DrawableRes;
import com.textuality.keybase.lib.Search;
@@ -100,4 +101,20 @@ public class GenericHttpsResource extends LinkedCookieResource {
return new GenericHttpsResource(flags, params, uri);
}
+ @Override
+ public @DrawableRes
+ int getDisplayIcon() {
+ return R.drawable.ssl_lock;
+ }
+
+ @Override
+ public String getDisplayTitle(Context context) {
+ return "https";
+ }
+
+ @Override
+ public String getDisplayComment(Context context) {
+ return null;
+ }
+
}
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 f6ec4f97a..3553ce740 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
@@ -1,6 +1,7 @@
package org.sufficientlysecure.keychain.pgp.linked.resources;
import android.content.Context;
+import android.support.annotation.DrawableRes;
import android.util.Base64;
import com.textuality.keybase.lib.JWalk;
@@ -16,6 +17,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.BasicHttpParams;
import org.json.JSONException;
import org.json.JSONObject;
+import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource;
@@ -121,4 +123,22 @@ public class TwitterResource extends LinkedCookieResource {
return getTwitterStream("Valodim");
}
+ @Override
+ public @DrawableRes int getDisplayIcon() {
+ return R.drawable.twitter;
+ }
+
+ @Override
+ public String getDisplayTitle(Context context) {
+ return "twitter";
+ }
+
+ @Override
+ public String getDisplayComment(Context context) {
+ return null;
+ }
+
+ public static LinkedCookieResource create(Set<String> flags, HashMap<String, String> params, URI subUri) {
+ return null;
+ }
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/UnknownResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/UnknownResource.java
deleted file mode 100644
index f29ab5b39..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/UnknownResource.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.sufficientlysecure.keychain.pgp.linked.resources;
-
-import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
-import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Set;
-
-public class UnknownResource extends LinkedCookieResource {
-
- public UnknownResource(Set<String> flags, HashMap<String,String> params, URI uri) {
- super(flags, params, uri);
- }
-
- @Override
- protected String fetchResource(OperationLog log, int indent) {
- return null;
- }
-
-}