aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-05 10:42:17 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-05 10:42:17 +0100
commit98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a (patch)
tree71efb2679748fd69bde186bd87cadb45172299b0
parent9798ef7bfda98cd30582bcac82e4f151d0c7cf94 (diff)
downloadopen-keychain-98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a.tar.gz
open-keychain-98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a.tar.bz2
open-keychain-98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a.zip
small fixes to the matcher
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java7
1 files changed, 2 insertions, 5 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 6077db606..59ffbfc45 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
@@ -39,7 +39,7 @@ public abstract class LinkedResource {
protected static LinkedCookieResource fromUri (URI uri) {
- if ("pgpid+cookie".equals(uri.getScheme())) {
+ if (!"pgpid+cookie".equals(uri.getScheme())) {
Log.e(Constants.TAG, "unknown uri scheme in (suspected) linked id packet");
return null;
}
@@ -60,13 +60,10 @@ public abstract class LinkedResource {
Set<String> flags = new HashSet<String>();
HashMap<String,String> params = new HashMap<String,String>();
- {
+ if (!pieces[0].isEmpty()) {
String[] rawParams = pieces[0].split(";");
for (String param : rawParams) {
String[] p = param.split("=", 2);
- if ("".equals(p[0])) {
- continue;
- }
if (p.length == 1) {
flags.add(param);
} else {