Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Major cleanup. Remove OkHttp and split mode. #255

Merged
merged 2 commits into from Mar 27, 2020
Merged

Major cleanup. Remove OkHttp and split mode. #255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f5f6de
Major cleanup. Remove OkHttp and split mode.
Jan 27, 2020
3657f64
Reintroduce empty RemoteConfig.
Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions Android/app/build.gradle
View file
Open in desktop
Expand Up @@ -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')
Expand Down
Binary file removed Android/app/libs/okhttp-3.12.8.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Android/app/libs/okio-1.17.5.jar
View file
Open in desktop
Binary file not shown.
34 changes: 0 additions & 34 deletions Android/app/src/main/java/app/intra/net/VpnAdapter.java
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions Android/app/src/main/java/app/intra/net/dns/DnsUdpQuery.java
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions Android/app/src/main/java/app/intra/net/doh/DualStackResult.java
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions Android/app/src/main/java/app/intra/net/doh/IpTagInterceptor.java
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions Android/app/src/main/java/app/intra/net/doh/JavaProber.java
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions Android/app/src/main/java/app/intra/net/doh/Race.java
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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);
}

Expand Down