aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-06 16:24:48 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-06 16:24:48 +0100
commita3ac2738ea6140c6a181f9b685249ad2f766f904 (patch)
tree1edcd1967a49639841a1ab24f658eccbc7d2300a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parent6e17d5244dcbfaad5c4de902e1f4c2cd913fd596 (diff)
downloadopen-keychain-a3ac2738ea6140c6a181f9b685249ad2f766f904.tar.gz
open-keychain-a3ac2738ea6140c6a181f9b685249ad2f766f904.tar.bz2
open-keychain-a3ac2738ea6140c6a181f9b685249ad2f766f904.zip
prepare superclass extraction for final linked id creation fragment
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java
index 4b01d8135..84b79920a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java
@@ -62,7 +62,7 @@ public abstract class LinkedCookieResource extends LinkedResource {
}
public static String generate (Context context, byte[] fingerprint, int nonce) {
- return String.format("\"[Verifying my PGP key: openpgp4fpr:%s#%08x]\"",
+ return String.format("[Verifying my PGP key: openpgp4fpr:%s#%08x]",
KeyFormattingUtils.convertFingerprintToHex(fingerprint), nonce);
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java
index 8b014db1d..8f0467734 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java
@@ -44,7 +44,7 @@ public class RawLinkedIdentity {
// return Hex.toHexString(data);
// debug for now
- return 1234567;
+ return 0x8a9bad32;
}
public @DrawableRes int getDisplayIcon() {
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 0ab90af75..eebe0b5ec 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
@@ -88,9 +88,9 @@ public class GenericHttpsResource extends LinkedCookieResource {
}
public static GenericHttpsResource createNew (URI uri) {
- HashSet<String> flags = new HashSet<String>();
+ HashSet<String> flags = new HashSet<>();
flags.add("generic");
- HashMap<String,String> params = new HashMap<String,String>();
+ HashMap<String,String> params = new HashMap<>();
return create(flags, params, uri);
}