diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 13:13:43 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 13:13:43 +0100 |
commit | 5d2c81d715cf1fd9ff23a8d1aa43fcfb58f7d099 (patch) | |
tree | 004c1cb4147e63b5d8096d637e3ab0f1d97c3463 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java | |
parent | 7b3bc4ca98c2be52bec996287c5997c3c52e3603 (diff) | |
download | open-keychain-5d2c81d715cf1fd9ff23a8d1aa43fcfb58f7d099.tar.gz open-keychain-5d2c81d715cf1fd9ff23a8d1aa43fcfb58f7d099.tar.bz2 open-keychain-5d2c81d715cf1fd9ff23a8d1aa43fcfb58f7d099.zip |
make linked identity list homogeneous
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java | 17 |
1 files changed, 14 insertions, 3 deletions
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 59ffbfc45..28f40f0d7 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 @@ -3,7 +3,7 @@ package org.sufficientlysecure.keychain.pgp.linked; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.linked.resources.DnsResource; import org.sufficientlysecure.keychain.pgp.linked.resources.GenericHttpsResource; -import org.sufficientlysecure.keychain.pgp.linked.resources.UnknownResource; +import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource; import org.sufficientlysecure.keychain.util.Log; import java.net.URI; @@ -12,6 +12,9 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; +import android.content.Context; +import android.support.annotation.DrawableRes; + public abstract class LinkedResource { protected final URI mSubUri; @@ -58,8 +61,8 @@ public abstract class LinkedResource { String[] pieces = specific.split("@", 2); URI subUri = URI.create(pieces[1]); - Set<String> flags = new HashSet<String>(); - HashMap<String,String> params = new HashMap<String,String>(); + Set<String> flags = new HashSet<>(); + HashMap<String,String> params = new HashMap<>(); if (!pieces[0].isEmpty()) { String[] rawParams = pieces[0].split(";"); for (String param : rawParams) { @@ -90,9 +93,17 @@ public abstract class LinkedResource { if (res != null) { return res; } + res = TwitterResource.create(flags, params, subUri); + if (res != null) { + return res; + } return null; } + public abstract @DrawableRes int getDisplayIcon(); + public abstract String getDisplayTitle(Context context); + public abstract String getDisplayComment(Context context); + } |