aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-09 12:29:43 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-09 12:29:43 +0200
commit57f72996e8e0db35e629ffd48f58cb5812f47788 (patch)
tree3e8d73a8171d8cc1bd5270eae332367f406a68fd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
parent4378f8f871f6a47321352f90a59cfaad7f52279b (diff)
downloadopen-keychain-57f72996e8e0db35e629ffd48f58cb5812f47788.tar.gz
open-keychain-57f72996e8e0db35e629ffd48f58cb5812f47788.tar.bz2
open-keychain-57f72996e8e0db35e629ffd48f58cb5812f47788.zip
linked-ids: rename "cookie" to "token"
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
index 078328198..ef042d540 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
@@ -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();