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

linked-ids: rename RawLinkedIdentity to UriAttribute

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-05-09 19:09:09 +02:00
parent 57f72996e8
commit 3600cda3bc
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/RawLinkedIdentity.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java
View File

@@ -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() {

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

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