Major cleanup. Remove OkHttp and split mode.

Jigsaw-Code · Mar 26, 2020 · 6f5f6de · 6f5f6de
1 parent 762a911
commit 6f5f6de
Show file tree

Hide file tree

Showing 39 changed files with 55 additions and 2,995 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -85,11 +85,7 @@ repositories {
 }
 
 dependencies {
-    // Third-party dependency: OkHttp3
     implementation fileTree(include: [
-            // 3.12.* has branched to support API <21.  3.13+ doesn't.
-            'okhttp-3.12.8.jar',
-            'okio-1.17.5.jar',
             'guava-28.2-android.jar',
             'failureaccess-1.0.1.jar' // Dependency of Guava
     ], dir: 'libs')

diff --git a/Android/app/libs/okhttp-3.12.8.jar b/Android/app/libs/okhttp-3.12.8.jar
diff --git a/Android/app/libs/okio-1.17.5.jar b/Android/app/libs/okio-1.17.5.jar
diff --git a/Android/app/src/main/java/app/intra/net/VpnAdapter.java b/Android/app/src/main/java/app/intra/net/VpnAdapter.java
diff --git a/Android/app/src/main/java/app/intra/net/dns/DnsUdpQuery.java b/Android/app/src/main/java/app/intra/net/dns/DnsUdpQuery.java
diff --git a/Android/app/src/main/java/app/intra/net/doh/DualStackResult.java b/Android/app/src/main/java/app/intra/net/doh/DualStackResult.java
diff --git a/Android/app/src/main/java/app/intra/net/doh/IpTagInterceptor.java b/Android/app/src/main/java/app/intra/net/doh/IpTagInterceptor.java
diff --git a/Android/app/src/main/java/app/intra/net/doh/JavaProber.java b/Android/app/src/main/java/app/intra/net/doh/JavaProber.java
diff --git a/Android/app/src/main/java/app/intra/net/doh/Race.java b/Android/app/src/main/java/app/intra/net/doh/Race.java
@@ -17,7 +17,6 @@
 
 import android.content.Context;
 import app.intra.net.go.GoProber;
-import app.intra.sys.firebase.RemoteConfig;
 
 /**
  * This class performs parallel probes to all of the specified servers and calls the listener when
@@ -40,8 +39,7 @@ public interface Listener {
    * @param listener Called once on an arbitrary thread with the result of the race.
    */
   public static void start(Context context, String[] urls, Listener listener) {
-    Prober prober = RemoteConfig.getUseGoDoh() ? new GoProber(context) :
-        new JavaProber(new ServerConnectionFactory(context));
+    Prober prober = new GoProber(context);
     start(prober, urls, listener);
   }