linked-ids: rename RawLinkedIdentity to UriAttribute

3 files changed, 11 insertions, 11 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedIdentity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedIdentity.java
index af19aefdd..11ddb2cea 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedIdentity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedIdentity.java
@@ -5,7 +5,7 @@ import java.net.URI;
 import android.content.Context;
 import android.support.annotation.DrawableRes;
 
-public class LinkedIdentity extends RawLinkedIdentity {
+public class LinkedIdentity extends UriAttribute {
 
     public final LinkedResource mResource;
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/RawLinkedIdentity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java
index 5310322f1..9bcf84994 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/RawLinkedIdentity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java
@@ -13,11 +13,11 @@ import android.content.Context;
 import android.support.annotation.DrawableRes;
 
 /** The RawLinkedIdentity contains raw parsed data from a Linked Identity subpacket. */
-public class RawLinkedIdentity {
+public class UriAttribute {
 
     public final URI mUri;
 
-    protected RawLinkedIdentity(URI uri) {
+    protected UriAttribute(URI uri) {
         mUri = uri;
     }
 
@@ -25,7 +25,7 @@ public class RawLinkedIdentity {
         return Strings.toUTF8ByteArray(mUri.toASCIIString());
     }
 
-    public static RawLinkedIdentity fromAttributeData(byte[] data) throws IOException {
+    public static UriAttribute fromAttributeData(byte[] data) throws IOException {
         WrappedUserAttribute att = WrappedUserAttribute.fromData(data);
 
         byte[][] subpackets = att.getSubpackets();
@@ -36,7 +36,7 @@ public class RawLinkedIdentity {
         throw new IOException("no subpacket data");
     }
 
-    static RawLinkedIdentity fromSubpacketData(byte[] data) {
+    static UriAttribute fromSubpacketData(byte[] data) {
 
         try {
             String uriStr = Strings.fromUTF8ByteArray(data);
@@ -44,7 +44,7 @@ public class RawLinkedIdentity {
 
             LinkedResource res = LinkedTokenResource.fromUri(uri);
             if (res == null) {
-                return new RawLinkedIdentity(uri);
+                return new UriAttribute(uri);
             }
 
             return new LinkedIdentity(uri, res);
@@ -55,13 +55,13 @@ public class RawLinkedIdentity {
         }
     }
 
-    public static RawLinkedIdentity fromResource (LinkedTokenResource res) {
-        return new RawLinkedIdentity(res.toUri());
+    public static UriAttribute fromResource (LinkedTokenResource res) {
+        return new UriAttribute(res.toUri());
     }
 
 
     public WrappedUserAttribute toUserAttribute () {
-        return WrappedUserAttribute.fromSubpacket(WrappedUserAttribute.UAT_LINKED_ID, getEncoded());
+        return WrappedUserAttribute.fromSubpacket(WrappedUserAttribute.UAT_URI_ATTRIBUTE, getEncoded());
     }
 
     public @DrawableRes int getDisplayIcon() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/DnsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/DnsResource.java
index 1e55b0fc3..dd7662c6e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/DnsResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/DnsResource.java
@@ -44,7 +44,7 @@ public class DnsResource extends LinkedTokenResource {
 
     public static String generateText(byte[] fingerprint) {
 
-        return String.format("openpgpid+token=%s",
+        return String.format("openpgp4fpr=%s",
                 KeyFormattingUtils.convertFingerprintToHex(fingerprint));
 
     }
@@ -52,7 +52,7 @@ public class DnsResource extends LinkedTokenResource {
     public static DnsResource createNew (String domain) {
         HashSet<String> flags = new HashSet<>();
         HashMap<String,String> params = new HashMap<>();
-        URI uri = URI.create("dns:" + domain);
+        URI uri = URI.create("dns:" + domain + "?TYPE=TXT");
         return create(flags, params, uri);
     }