cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare superclass extraction for final linked id creation fragment

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-06 16:24:48 +01:00
parent 6e17d5244d
commit a3ac2738ea
5 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java
View File

@@ -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);
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java
View File

@@ -44,7 +44,7 @@ public class RawLinkedIdentity {
// return Hex.toHexString(data);
// debug for now
return 1234567;
return 0x8a9bad32;
}
public @DrawableRes int getDisplayIcon() {

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java
View File

@@ -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);
}