111 fixed, updated OkHttp 3.2.0->3.9.0

app/src/debug/java/com/artemzin/qualitymatters/network/OkHttpInterceptorsModule.java

@@ -1,19 +1,17 @@
 package com.artemzin.qualitymatters.network;
 
 import android.support.annotation.NonNull;
-
 import com.facebook.stetho.okhttp3.StethoInterceptor;
-
-import java.util.List;
-
-import javax.inject.Singleton;
-
 import dagger.Module;
 import dagger.Provides;
 import okhttp3.Interceptor;
 import okhttp3.logging.HttpLoggingInterceptor;
 import timber.log.Timber;
 
+import javax.inject.Singleton;
+import java.util.Arrays;
+import java.util.List;
+
 import static java.util.Collections.singletonList;
 
 /**
@@ -28,9 +26,15 @@ public HttpLoggingInterceptor provideHttpLoggingInterceptor() {
         return new HttpLoggingInterceptor(message -> Timber.d(message));
     }
 
+    @Provides @Singleton @NonNull
+    public HostSelectionInterceptor provideHostSelectionInterceptor() {
+        return new HostSelectionInterceptor();
+    }
+
     @Provides @OkHttpInterceptors @Singleton @NonNull
-    public List<Interceptor> provideOkHttpInterceptors(@NonNull HttpLoggingInterceptor httpLoggingInterceptor) {
-        return singletonList(httpLoggingInterceptor);
+    public List<Interceptor> provideOkHttpInterceptors(@NonNull HttpLoggingInterceptor httpLoggingInterceptor,
+                                                       @NonNull HostSelectionInterceptor hostSelectionInterceptor) {
+        return Arrays.asList(httpLoggingInterceptor, hostSelectionInterceptor);
     }
 
     @Provides @OkHttpNetworkInterceptors @Singleton @NonNull

app/src/functionalTests/java/com/artemzin/qualitymatters/functional_tests/rules/MockWebServerRule.java

@@ -1,17 +1,14 @@
 package com.artemzin.qualitymatters.functional_tests.rules;
 
 import android.support.annotation.NonNull;
-
 import com.artemzin.qualitymatters.functional_tests.TestUtils;
-
+import okhttp3.mockwebserver.MockWebServer;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
 import java.lang.reflect.Method;
 
-import okhttp3.mockwebserver.MockWebServer;
-
 /**
  * JUnit test rule for mocking web server!
  */
@@ -36,7 +33,7 @@ public void evaluate() throws Throwable {
                     final MockWebServer mockWebServer = new MockWebServer();
                     mockWebServer.start();
 
-                    TestUtils.app().applicationComponent().changeableBaseUrl().setBaseUrl(mockWebServer.url("").toString());
+                    TestUtils.app().applicationComponent().hostSelectionInterceptor().setHost(mockWebServer.url("").toString());
 
                     if (!needsMockWebServer.setupMethod().isEmpty()) {
                         final Method setupMethod = testClassInstance.getClass().getDeclaredMethod(needsMockWebServer.setupMethod(), MockWebServer.class);

app/src/integrationTests/java/com/artemzin/qualitymatters/integration_tests/api/QualityMattersRestApiIntegrationTest.java

@@ -3,19 +3,17 @@
 import com.artemzin.qualitymatters.QualityMattersIntegrationRobolectricTestRunner;
 import com.artemzin.qualitymatters.api.QualityMattersRestApi;
 import com.artemzin.qualitymatters.api.entities.Item;
-
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import retrofit2.adapter.rxjava.HttpException;
 
 import java.io.IOException;
 import java.util.List;
 
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import retrofit2.adapter.rxjava.HttpException;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
@@ -39,7 +37,7 @@ public void beforeEachTest() throws IOException {
         mockWebServer.start();
 
         // Change base url to the mocked
-        QualityMattersIntegrationRobolectricTestRunner.qualityMattersApp().applicationComponent().changeableBaseUrl().setBaseUrl(mockWebServer.url("").toString());
+        QualityMattersIntegrationRobolectricTestRunner.qualityMattersApp().applicationComponent().hostSelectionInterceptor().setHost(mockWebServer.url("").toString());
 
         qualityMattersRestApi = QualityMattersIntegrationRobolectricTestRunner.qualityMattersApp().applicationComponent().qualityMattersApi();
     }

app/src/main/java/com/artemzin/qualitymatters/ApplicationComponent.java

@@ -1,9 +1,7 @@
 package com.artemzin.qualitymatters;
 
 import android.support.annotation.NonNull;
-
 import com.artemzin.qualitymatters.api.ApiModule;
-import com.artemzin.qualitymatters.api.ChangeableBaseUrl;
 import com.artemzin.qualitymatters.api.QualityMattersRestApi;
 import com.artemzin.qualitymatters.developer_settings.DevMetricsProxy;
 import com.artemzin.qualitymatters.developer_settings.DeveloperSettingsComponent;
@@ -12,18 +10,18 @@
 import com.artemzin.qualitymatters.developer_settings.LeakCanaryProxy;
 import com.artemzin.qualitymatters.models.AnalyticsModel;
 import com.artemzin.qualitymatters.models.ModelsModule;
+import com.artemzin.qualitymatters.network.HostSelectionInterceptor;
 import com.artemzin.qualitymatters.network.NetworkModule;
 import com.artemzin.qualitymatters.network.OkHttpInterceptorsModule;
 import com.artemzin.qualitymatters.performance.AsyncJobsModule;
 import com.artemzin.qualitymatters.performance.AsyncJobsObserver;
 import com.artemzin.qualitymatters.ui.activities.MainActivity;
 import com.artemzin.qualitymatters.ui.fragments.ItemsFragment;
 import com.google.gson.Gson;
+import dagger.Component;
 
 import javax.inject.Singleton;
 
-import dagger.Component;
-
 @Singleton
 @Component(modules = {
         ApplicationModule.class,
@@ -44,9 +42,6 @@ public interface ApplicationComponent {
     @NonNull
     QualityMattersRestApi qualityMattersApi();
 
-    @NonNull
-    ChangeableBaseUrl changeableBaseUrl();
-
     // Provide AsyncJobObserver from the real app to the tests without need in injection to the test.
     @NonNull
     AsyncJobsObserver asyncJobsObserver();
@@ -68,5 +63,7 @@ public interface ApplicationComponent {
 
     DevMetricsProxy devMetricsProxy();
 
+    HostSelectionInterceptor hostSelectionInterceptor();
+
     void inject(@NonNull MainActivity mainActivity);
 }

app/src/main/java/com/artemzin/qualitymatters/api/ApiModule.java

@@ -1,38 +1,33 @@
 package com.artemzin.qualitymatters.api;
 
 import android.support.annotation.NonNull;
-
 import com.artemzin.qualitymatters.BuildConfig;
 import com.google.gson.Gson;
-
-import javax.inject.Singleton;
-
 import dagger.Module;
 import dagger.Provides;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
+import javax.inject.Singleton;
+
 @Module
 public class ApiModule {
 
     @NonNull
-    private final ChangeableBaseUrl changeableBaseUrl;
+    private final String baseUrl;
 
     public ApiModule(@NonNull String baseUrl) {
-        changeableBaseUrl = new ChangeableBaseUrl(baseUrl);
-    }
-
-    @Provides @NonNull @Singleton
-    public ChangeableBaseUrl provideChangeableBaseUrl() {
-        return changeableBaseUrl;
+        this.baseUrl = baseUrl;
     }
 
-    @Provides @NonNull @Singleton
-    public QualityMattersRestApi provideQualityMattersApi(@NonNull OkHttpClient okHttpClient, @NonNull Gson gson, @NonNull ChangeableBaseUrl changeableBaseUrl) {
+    @Provides
+    @NonNull
+    @Singleton
+    public QualityMattersRestApi provideQualityMattersApi(@NonNull OkHttpClient okHttpClient, @NonNull Gson gson) {
         return new Retrofit.Builder()
-                .baseUrl(changeableBaseUrl)
+                .baseUrl(baseUrl)
                 .client(okHttpClient)
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .addCallAdapterFactory(RxJavaCallAdapterFactory.create())

app/src/main/java/com/artemzin/qualitymatters/network/HostSelectionInterceptor.java

@@ -0,0 +1,43 @@
+package com.artemzin.qualitymatters.network;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * An interceptor that allows runtime changes to the URL hostname.
+ * As per https://gist.github.com/swankjesse/8571a8207a5815cca1fb
+ */
+public final class HostSelectionInterceptor implements Interceptor {
+    /**
+     * Using static variable in order to avoid adding this interceptor to ApplicationComponent
+     */
+    private volatile String host;
+
+    public void setHost(@Nullable String host) {
+        this.host = host;
+    }
+
+    @Override
+    public okhttp3.Response intercept(@NonNull Chain chain) throws IOException {
+        Request request = chain.request();
+        String host = this.host;
+        if (host != null) {
+            URI uri = URI.create(host);
+            HttpUrl newUrl = request.url().newBuilder()
+                    .host(uri.getHost())
+                    .port(uri.getPort())
+                    .scheme("http") //in order to avoid SSL Handshake failure
+                    .build();
+            request = request.newBuilder()
+                    .url(newUrl)
+                    .build();
+        }
+        return chain.proceed(request);
+    }
+}

app/src/main/java/com/artemzin/qualitymatters/network/NetworkModule.java

@@ -1,16 +1,14 @@
 package com.artemzin.qualitymatters.network;
 
 import android.support.annotation.NonNull;
-
-import java.util.List;
-
-import javax.inject.Singleton;
-
 import dagger.Module;
 import dagger.Provides;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 
+import javax.inject.Singleton;
+import java.util.List;
+
 @Module
 public class NetworkModule {
 

app/src/release/java/com/artemzin/qualitymatters/network/OkHttpInterceptorsModule.java

@@ -1,16 +1,15 @@
 package com.artemzin.qualitymatters.network;
 
 import android.support.annotation.NonNull;
-
-import java.util.List;
-
-import javax.inject.Singleton;
-
 import dagger.Module;
 import dagger.Provides;
 import okhttp3.Interceptor;
 
+import javax.inject.Singleton;
+import java.util.List;
+
 import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 
 /**
  * Provides OkHttp interceptors for release build.
@@ -19,12 +18,17 @@
 public class OkHttpInterceptorsModule {
 
     @Provides @OkHttpInterceptors @Singleton @NonNull
-    public List<Interceptor> provideOkHttpInterceptors() {
-        return emptyList();
+    public List<Interceptor> provideOkHttpInterceptors(@NonNull HostSelectionInterceptor hostSelectionInterceptor) {
+        return singletonList(hostSelectionInterceptor);
     }
 
     @Provides @OkHttpNetworkInterceptors @Singleton @NonNull
     public List<Interceptor> provideOkHttpNetworkInterceptors() {
         return emptyList();
     }
+
+    @Provides @Singleton @NonNull
+    public HostSelectionInterceptor provideHostSelectionInterceptor() {
+        return new HostSelectionInterceptor();
+    }
 }

dependencies.gradle

@@ -23,7 +23,7 @@ ext.versions = [
         rxJavaProguardRules          : '1.1.8.0',
         rxLint                       : '1.6',
         supportLibs                  : '23.1.1',
-        okHttp                       : '3.2.0',
+        okHttp                       : '3.9.0',
         retrofit                     : '2.0.0-beta4',
         gson                         : '2.7',
         autoValue                    : '1.2',

proguard/proguard-square-okhttp.pro

@@ -0,0 +1,2 @@
+# OkHttp3
+-dontwarn okhttp3.**