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 19:26:11 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-09 19:27:33 +0200
commit9aff6c7f8527f3eb78a14c62a677a2fd0631130e (patch)
tree7cd54a583932cbf1a10c3531f576cee891277518 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/GithubResource.java
parent3600cda3bcf1797db60c870a5fa582a27856e666 (diff)
downloadopen-keychain-9aff6c7f8527f3eb78a14c62a677a2fd0631130e.tar.gz
open-keychain-9aff6c7f8527f3eb78a14c62a677a2fd0631130e.tar.bz2
open-keychain-9aff6c7f8527f3eb78a14c62a677a2fd0631130e.zip
linked-ids: add certificate pinning, pin twitter api cert
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.java12
1 files changed, 6 insertions, 6 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 ef042d540..30ce075b4 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
@@ -49,14 +49,14 @@ public class GithubResource extends LinkedTokenResource {
@SuppressWarnings("deprecation") // HttpGet is deprecated
@Override
- protected String fetchResource (OperationLog log, int indent)
+ protected String fetchResource (Context context, OperationLog log, int indent)
throws HttpStatusException, IOException, JSONException {
log.add(LogType.MSG_LV_FETCH, indent, mSubUri.toString());
indent += 1;
HttpGet httpGet = new HttpGet("https://api.github.com/gists/" + mGistId);
- String response = getResponseBody(httpGet);
+ String response = getResponseBody(context, httpGet);
JSONObject obj = new JSONObject(response);
@@ -80,8 +80,8 @@ public class GithubResource extends LinkedTokenResource {
}
@SuppressWarnings("deprecation")
- public static GithubResource searchInGithubStream(String screenName, String needle,
- OperationLog log) {
+ public static GithubResource searchInGithubStream(
+ Context context, String screenName, String needle, OperationLog log) {
// narrow the needle down to important part
Matcher matcher = magicPattern.matcher(needle);
@@ -98,7 +98,7 @@ public class GithubResource extends LinkedTokenResource {
httpGet.setHeader("Content-Type", "application/json");
httpGet.setHeader("User-Agent", "OpenKeychain");
- String response = getResponseBody(httpGet);
+ String response = getResponseBody(context, httpGet);
array = new JSONArray(response);
}
@@ -118,7 +118,7 @@ public class GithubResource extends LinkedTokenResource {
HttpGet httpGet = new HttpGet("https://api.github.com/gists/" + id);
httpGet.setHeader("User-Agent", "OpenKeychain");
- JSONObject gistObj = new JSONObject(getResponseBody(httpGet));
+ JSONObject gistObj = new JSONObject(getResponseBody(context, httpGet));
JSONObject gistFiles = gistObj.getJSONObject("files");
Iterator<String> gistIt = gistFiles.keys();
if (!gistIt.hasNext()) {