aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-04-09 11:53:37 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2016-04-09 11:53:37 +0200
commit2d762e55da92ef45576967c0d1befef55e7935ea (patch)
treea1a9e991817d8a6379c1146ae6b76b6078dee280 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
parent4edb805ba1d0e6de966692bbf0ba045fb11211e2 (diff)
downloadopen-keychain-2d762e55da92ef45576967c0d1befef55e7935ea.tar.gz
open-keychain-2d762e55da92ef45576967c0d1befef55e7935ea.tar.bz2
open-keychain-2d762e55da92ef45576967c0d1befef55e7935ea.zip
Okhttp3 cleanups, docs, and fix timeouts for default client
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
index 24fa3bd67..4a8882d50 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
@@ -241,11 +241,11 @@ public abstract class LinkedTokenResource extends LinkedResource {
public static String getResponseBody(Request request, String... pins)
throws IOException, HttpStatusException {
- Log.d("Connection to: "+request.url().url().getHost(),"");
+ Log.d("Connection to: " + request.url().url().getHost(), "");
OkHttpClient client;
- if(pins !=null){
- client = OkHttpClientFactory.getPinnedSimpleClient(getCertificatePinner(request.url().url().getHost(),pins));
- }else{
+ if (pins != null) {
+ client = OkHttpClientFactory.getPinnedSimpleClient(getCertificatePinner(request.url().url().getHost(), pins));
+ } else {
client = OkHttpClientFactory.getSimpleClient();
}