aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-10-26 20:53:32 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-10-26 20:53:32 +0100
commit67a51cdfe3f6fb7982b27eb2b6d4b1b5d49f69aa (patch)
tree80a022ae1e631a779bae5da6f5594300bb1d15fb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
parent33fea901e911fba90cff10a732f359028d02fd86 (diff)
downloadopen-keychain-67a51cdfe3f6fb7982b27eb2b6d4b1b5d49f69aa.tar.gz
open-keychain-67a51cdfe3f6fb7982b27eb2b6d4b1b5d49f69aa.tar.bz2
open-keychain-67a51cdfe3f6fb7982b27eb2b6d4b1b5d49f69aa.zip
Target SDK 23 and related fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java5
1 files changed, 2 insertions, 3 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 998ec3ad4..e5a128e32 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
@@ -1,5 +1,7 @@
package org.sufficientlysecure.keychain.linked;
+import android.content.Context;
+
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@@ -8,7 +10,6 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.BasicHttpParams;
import org.json.JSONException;
import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.linked.resources.DnsResource;
import org.sufficientlysecure.keychain.linked.resources.GenericHttpsResource;
import org.sufficientlysecure.keychain.linked.resources.GithubResource;
import org.sufficientlysecure.keychain.linked.resources.TwitterResource;
@@ -32,8 +33,6 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import android.content.Context;
-
public abstract class LinkedTokenResource extends LinkedResource {