update uris and cookie patterns, plus some stylings

3 files changed, 7 insertions, 7 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 606c951b8..37265b2b5 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
@@ -35,7 +35,7 @@ public abstract class LinkedCookieResource extends LinkedResource {
     public URI toUri () {
 
         StringBuilder b = new StringBuilder();
-        b.append("pgpid+cookie:");
+        b.append("openpgpid+cookie:");
 
         // add flags
         if (mFlags != null) {
@@ -73,12 +73,12 @@ public abstract class LinkedCookieResource extends LinkedResource {
     }
 
     public static String generate (Context context, byte[] fingerprint) {
-        return String.format("[Verifying my PGP key: openpgp4fpr:%s]",
+        return String.format("[Verifying my OpenPGP key: openpgp4fpr:%s]",
                 KeyFormattingUtils.convertFingerprintToHex(fingerprint));
     }
 
     public static String generatePreview () {
-        return "[Verifying my PGP key: openpgp4fpr:0x…]";
+        return "[Verifying my OpenPGP key: openpgp4fpr:0x…]";
     }
 
     public LinkedVerifyResult verify(byte[] fingerprint) {
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 5a0fc6e47..26fc9f4cf 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
@@ -26,7 +26,7 @@ public abstract class LinkedResource {
     protected final HashMap<String,String> mParams;
 
     public static Pattern magicPattern =
-            Pattern.compile("\\[Verifying my PGP key: openpgp4fpr:([a-zA-Z0-9]+)]");
+            Pattern.compile("\\[Verifying my (?:Open)?PGP key: openpgp4fpr:([a-zA-Z0-9]+)]");
 
     protected LinkedResource(Set<String> flags, HashMap<String, String> params, URI uri) {
         mFlags = flags;
@@ -44,7 +44,7 @@ public abstract class LinkedResource {
 
     protected static LinkedCookieResource fromUri (URI uri) {
 
-        if (!"pgpid+cookie".equals(uri.getScheme())) {
+        if (!"openpgpid+cookie".equals(uri.getScheme())) {
             Log.e(Constants.TAG, "unknown uri scheme in (suspected) linked id packet");
             return null;
         }
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 a8faa435d..3ca71c74b 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
@@ -27,7 +27,7 @@ import de.measite.minidns.record.TXT;
 public class DnsResource extends LinkedCookieResource {
 
     final static Pattern magicPattern =
-            Pattern.compile("pgpid\\+cookie=([a-zA-Z0-9]+)(?:#|;)([a-zA-Z0-9]+)");
+            Pattern.compile("openpgpid\\+cookie=([a-zA-Z0-9]+)(?:#|;)([a-zA-Z0-9]+)");
 
     String mFqdn;
     CLASS mClass;
@@ -44,7 +44,7 @@ public class DnsResource extends LinkedCookieResource {
 
     public static String generateText (Context context, byte[] fingerprint) {
 
-        return String.format("pgpid+cookie=%s",
+        return String.format("openpgpid+cookie=%s",
                 KeyFormattingUtils.convertFingerprintToHex(fingerprint));
 
     }