gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-12 23:34:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for proxy auth

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-10-25 22:37:57 +02:00
parent 918e0085a4
commit 7442340105
2 changed files with 34 additions and 1 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

@ -41,11 +41,14 @@ import javax.inject.Singleton;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import okhttp3.Authenticator;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.Credentials;
import okhttp3.Interceptor; import okhttp3.Interceptor;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.Route;
import okhttp3.logging.HttpLoggingInterceptor; import okhttp3.logging.HttpLoggingInterceptor;
import retrofit2.Retrofit; import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
@ -86,7 +89,7 @@ public class RestModule {
@Provides @Provides
@Singleton @Singleton
OkHttpClient provideHttpClient(@Nullable Proxy proxy) { OkHttpClient provideHttpClient(@Nullable 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
@ -102,6 +105,13 @@ public class RestModule {
if (proxy != null) { if (proxy != null) {
httpClient.proxy(proxy); httpClient.proxy(proxy);
if (!TextUtils.isEmpty(appPreferences.getProxyServer().getUsername()) &&
!TextUtils.isEmpty(appPreferences.getProxyServer().getPassword())) {
httpClient.proxyAuthenticator(new ProxyAuthenticator(Credentials.basic(
appPreferences.getProxyServer().getUsername(),
appPreferences.getProxyServer().getPassword())));
}
} }
httpClient.addInterceptor(new HeadersInterceptor()); httpClient.addInterceptor(new HeadersInterceptor());
@ -109,6 +119,23 @@ public class RestModule {
return httpClient.build(); return httpClient.build();
} }
private class ProxyAuthenticator implements Authenticator {
private String credentials;
private ProxyAuthenticator(String credentials) {
this.credentials = credentials;
}
@Nullable
@Override
public Request authenticate(@NonNull Route route, @NonNull Response response) throws IOException {
return response.request().newBuilder()
.header("Proxy-Authorization", credentials)
.build();
}
}
private class HeadersInterceptor implements Interceptor { private class HeadersInterceptor implements Interceptor {
@Override @Override

6
app/src/main/java/com/nextcloud/talk/utils/preferences/json/ProxyPrefs.java
View File

@ -40,4 +40,10 @@ public class ProxyPrefs {
@JsonField(name = "proxy_type") @JsonField(name = "proxy_type")
String proxyType; String proxyType;
@JsonField(name = "username")
String username;
@JsonField(name = "password")
String password;
} }