gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve proxy support

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-10-25 23:14:45 +02:00
parent 7442340105
commit 5652ae837a
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
View File

@ -64,14 +64,18 @@ public class RestModule {
@Provides @Provides
@Singleton @Singleton
@Nullable
Proxy provideProxy(AppPreferences appPreferences) { Proxy provideProxy(AppPreferences appPreferences) {
ProxyPrefs proxyPrefs = appPreferences.getProxyServer(); ProxyPrefs proxyPrefs = appPreferences.getProxyServer();
if (!TextUtils.isEmpty(proxyPrefs.getProxyHost())) { if (!TextUtils.isEmpty(proxyPrefs.getProxyHost())) {
return (new Proxy(Proxy.Type.valueOf(proxyPrefs.getProxyType()), if (Proxy.Type.SOCKS.equals(Proxy.Type.valueOf(proxyPrefs.getProxyType()))) {
new InetSocketAddress(proxyPrefs.getProxyHost(), proxyPrefs.getProxyPort()))); return (new Proxy(Proxy.Type.valueOf(proxyPrefs.getProxyType()),
InetSocketAddress.createUnresolved(proxyPrefs.getProxyHost(), proxyPrefs.getProxyPort())));
} else {
return (new Proxy(Proxy.Type.valueOf(proxyPrefs.getProxyType()),
new InetSocketAddress(proxyPrefs.getProxyHost(), proxyPrefs.getProxyPort())));
}
} else { } else {
return null; return Proxy.NO_PROXY;
} }
} }
@ -89,7 +93,7 @@ public class RestModule {
@Provides @Provides
@Singleton @Singleton
OkHttpClient provideHttpClient(@Nullable Proxy proxy, AppPreferences appPreferences) { OkHttpClient provideHttpClient(Proxy proxy, AppPreferences appPreferences) {
OkHttpClient.Builder httpClient = new OkHttpClient.Builder(); OkHttpClient.Builder httpClient = new OkHttpClient.Builder();
int cacheSize = 128 * 1024 * 1024; // 128 MB int cacheSize = 128 * 1024 * 1024; // 128 MB
@ -103,7 +107,7 @@ public class RestModule {
httpClient.addInterceptor(loggingInterceptor); httpClient.addInterceptor(loggingInterceptor);
} }
if (proxy != null) { if (!Proxy.NO_PROXY.equals(proxy)) {
httpClient.proxy(proxy); httpClient.proxy(proxy);
if (!TextUtils.isEmpty(appPreferences.getProxyServer().getUsername()) && if (!TextUtils.isEmpty(appPreferences.getProxyServer().getUsername()) &&
@ -130,6 +134,19 @@ public class RestModule {
@Nullable @Nullable
@Override @Override
public Request authenticate(@NonNull Route route, @NonNull Response response) throws IOException { public Request authenticate(@NonNull Route route, @NonNull Response response) throws IOException {
if (credentials.equals(response.request().header("Proxy-Authorization"))) {
return null;
}
int attemptsCount = 0;
Response countedResponse = response;
while ((countedResponse = countedResponse.priorResponse()) != null) {
attemptsCount++;
if (attemptsCount == 3) {
return null;
}
}
return response.request().newBuilder() return response.request().newBuilder()
.header("Proxy-Authorization", credentials) .header("Proxy-Authorization", credentials)
.build(); .build();