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

linked-ids: rename "cookie" to "token"

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-05-09 12:29:43 +02:00
parent 4378f8f871
commit 57f72996e8
12 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedCookieResource.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
View File

@@ -31,7 +31,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public abstract class LinkedCookieResource extends LinkedResource {
public abstract class LinkedTokenResource extends LinkedResource {
protected final URI mSubUri;
protected final Set<String> mFlags;
@@ -40,7 +40,7 @@ public abstract class LinkedCookieResource extends LinkedResource {
public static Pattern magicPattern =
Pattern.compile("\\[Verifying my (?:Open)?PGP key: openpgp4fpr:([a-zA-Z0-9]+)]");
protected LinkedCookieResource(Set<String> flags, HashMap<String, String> params, URI uri) {
protected LinkedTokenResource(Set<String> flags, HashMap<String, String> params, URI uri) {
mFlags = flags;
mParams = params;
mSubUri = uri;
@@ -64,9 +64,9 @@ public abstract class LinkedCookieResource extends LinkedResource {
KeyFormattingUtils.convertFingerprintToHex(fingerprint));
}
protected static LinkedCookieResource fromUri (URI uri) {
protected static LinkedTokenResource fromUri (URI uri) {
if (!"openpgpid+cookie".equals(uri.getScheme())) {
if (!"openpgpid+token".equals(uri.getScheme())) {
Log.e(Constants.TAG, "unknown uri scheme in (suspected) linked id packet");
return null;
}
@@ -103,11 +103,11 @@ public abstract class LinkedCookieResource extends LinkedResource {
}
protected static LinkedCookieResource findResourceType (Set<String> flags,
protected static LinkedTokenResource findResourceType (Set<String> flags,
HashMap<String,String> params,
URI subUri) {
LinkedCookieResource res;
LinkedTokenResource res;
res = GenericHttpsResource.create(flags, params, subUri);
if (res != null) {
@@ -133,7 +133,7 @@ public abstract class LinkedCookieResource extends LinkedResource {
public URI toUri () {
StringBuilder b = new StringBuilder();
b.append("openpgpid+cookie:");
b.append("openpgpid+token:");
// add flags
if (mFlags != null) {

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

@@ -42,7 +42,7 @@ public class RawLinkedIdentity {
String uriStr = Strings.fromUTF8ByteArray(data);
URI uri = URI.create(uriStr);
LinkedResource res = LinkedCookieResource.fromUri(uri);
LinkedResource res = LinkedTokenResource.fromUri(uri);
if (res == null) {
return new RawLinkedIdentity(uri);
}
@@ -55,7 +55,7 @@ public class RawLinkedIdentity {
}
}
public static RawLinkedIdentity fromResource (LinkedCookieResource res) {
public static RawLinkedIdentity fromResource (LinkedTokenResource res) {
return new RawLinkedIdentity(res.toUri());
}

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

@@ -6,7 +6,7 @@ import android.support.annotation.StringRes;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.linked.LinkedCookieResource;
import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import java.net.URI;
@@ -24,10 +24,10 @@ import de.measite.minidns.Record.CLASS;
import de.measite.minidns.Record.TYPE;
import de.measite.minidns.record.TXT;
public class DnsResource extends LinkedCookieResource {
public class DnsResource extends LinkedTokenResource {
final static Pattern magicPattern =
Pattern.compile("openpgpid\\+cookie=([a-zA-Z0-9]+)(?:#|;)([a-zA-Z0-9]+)");
Pattern.compile("openpgpid\\+token=([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(byte[] fingerprint) {
return String.format("openpgpid+cookie=%s",
return String.format("openpgpid+token=%s",
KeyFormattingUtils.convertFingerprintToHex(fingerprint));
}

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

@@ -10,7 +10,7 @@ import org.apache.http.client.methods.HttpGet;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.linked.LinkedCookieResource;
import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import java.io.IOException;
@@ -19,17 +19,17 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
public class GenericHttpsResource extends LinkedCookieResource {
public class GenericHttpsResource extends LinkedTokenResource {
GenericHttpsResource(Set<String> flags, HashMap<String,String> params, URI uri) {
super(flags, params, uri);
}
public static String generateText (Context context, byte[] fingerprint) {
String cookie = LinkedCookieResource.generate(fingerprint);
String token = LinkedTokenResource.generate(fingerprint);
return String.format(context.getResources().getString(R.string.linked_id_generic_text),
cookie, "0x" + KeyFormattingUtils.convertFingerprintToHex(fingerprint).substring(24));
token, "0x" + KeyFormattingUtils.convertFingerprintToHex(fingerprint).substring(24));
}
@SuppressWarnings("deprecation") // HttpGet is deprecated

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
View File

@@ -14,7 +14,7 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.linked.LinkedCookieResource;
import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
import org.sufficientlysecure.keychain.util.Log;
import java.io.IOException;
@@ -28,7 +28,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class GithubResource extends LinkedCookieResource {
public class GithubResource extends LinkedTokenResource {
final String mHandle;
final String mGistId;
@@ -42,9 +42,9 @@ public class GithubResource extends LinkedCookieResource {
}
public static String generate(Context context, byte[] fingerprint) {
String cookie = LinkedCookieResource.generate(fingerprint);
String token = LinkedTokenResource.generate(fingerprint);
return String.format(context.getResources().getString(R.string.linked_id_github_text), cookie);
return String.format(context.getResources().getString(R.string.linked_id_github_text), token);
}
@SuppressWarnings("deprecation") // HttpGet is deprecated
@@ -86,7 +86,7 @@ public class GithubResource extends LinkedCookieResource {
// narrow the needle down to important part
Matcher matcher = magicPattern.matcher(needle);
if (!matcher.find()) {
throw new AssertionError("Needle must contain cookie pattern! This is a programming error, please report.");
throw new AssertionError("Needle must contain token pattern! This is a programming error, please report.");
}
needle = matcher.group();

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

@@ -19,7 +19,7 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.linked.LinkedCookieResource;
import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -30,7 +30,7 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class TwitterResource extends LinkedCookieResource {
public class TwitterResource extends LinkedTokenResource {
final String mHandle;
final String mTweetId;