Merge pull request #12 from CottaCush/fixes/http-logging-fixes

Enable http logging interceptor in retrofit client only if `isDebug` is true

Author: goke-epapa

app/src/androidTest/java/com/cottacush/android/libraries/RetrofitClientInstrumentationTest.java

@@ -51,7 +51,7 @@ public void testBuildWithOkHttpClient() throws Exception {
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
         //make request to a url pointing to our fake server
         String serverUrl = server.url("").toString();
-        Retrofit retrofit = new RetrofitClient().build(serverUrl, builder);
+        Retrofit retrofit = new RetrofitClient(true).build(serverUrl, builder);
         CallTestService callTestService = retrofit.create(CallTestService.class);
         JsonElement jsonElementReturnedFromServer = callTestService.getAccessToken().execute().body();
         // Grab the request recieved
@@ -74,7 +74,7 @@ public void testBuildWithOkHttpClient() throws Exception {
     public void testBuildWithInterceptor() throws Exception {
         //make request to our fake server
         String serverUrl = server.url("").toString();
-        Retrofit retrofit = new RetrofitClient().build(serverUrl, HttpLoggingInterceptor.Level.BODY);
+        Retrofit retrofit = new RetrofitClient(true).build(serverUrl, HttpLoggingInterceptor.Level.BODY);
         CallTestService callTestService = retrofit.create(CallTestService.class);
         JsonElement jsonElementReturnedFromServer = callTestService.getAccessToken().execute().body();
         RecordedRequest request1 = server.takeRequest();
@@ -99,7 +99,7 @@ public void testBuildWithParams() throws Exception {
         params.put("Key1", "value1");
         //make request to our fake server
         String serverUrl = server.url("").toString();
-        Retrofit retrofit = new RetrofitClient().build(serverUrl, params);
+        Retrofit retrofit = new RetrofitClient(true).build(serverUrl, params);
         CallTestService callTestService = retrofit.create(CallTestService.class);
         JsonElement jsonElementReturnedFromServer = callTestService.getAccessToken().execute().body();
         RecordedRequest request1 = server.takeRequest();
@@ -124,7 +124,7 @@ public void testBuildWithParams() throws Exception {
     @Test
     public void testBuildWithUrlOnly() {
         String expected = "http://testurl.com/";
-        Retrofit retrofit = new RetrofitClient().build(expected);
+        Retrofit retrofit = new RetrofitClient(true).build(expected);
         String actual = retrofit.baseUrl().toString();
         assertEquals(expected, actual);
     }
@@ -138,12 +138,12 @@ public interface CallTestService {
 
     @Test
     public void testGetBasicRetrofitBuilder() throws Exception {
-        assertEquals(true, (new RetrofitClient().getBasicRetrofitBuilder() != null));
+        assertEquals(true, (new RetrofitClient(true).getBasicRetrofitBuilder() != null));
     }
 
     @Test
     public void testGetBasicHttpClientBuilder() throws Exception {
-        assertEquals(true, (new RetrofitClient().getBasicHttpClientBuilder() != null));
+        assertEquals(true, (new RetrofitClient(true).getBasicHttpClientBuilder() != null));
     }
 
 }

app/src/main/java/com/cottacush/android/libraries/utils/RetrofitClient.java

@@ -17,8 +17,10 @@
  */
 public class RetrofitClient {
     private Retrofit.Builder builder;
+    private boolean isDebug;
 
-    public RetrofitClient() {
+    public RetrofitClient(boolean isDebug) {
+        this.isDebug = isDebug;
         builder = new Retrofit.Builder()
                 .addConverterFactory(GsonConverterFactory.create());
     }
@@ -59,8 +61,11 @@ public OkHttpClient.Builder getHttpClient() {
     }
 
     public OkHttpClient.Builder getHttpClient(HttpLoggingInterceptor.Level level) {
-        return getHttpClient()
-                .addInterceptor(getLoggingInterceptor(level));
+        OkHttpClient.Builder httpClient = getHttpClient();
+        if (isDebug) {
+            httpClient.addInterceptor(getLoggingInterceptor(level));
+        }
+        return httpClient;
     }
 
     public HttpLoggingInterceptor getLoggingInterceptor(HttpLoggingInterceptor.Level level) {
@@ -78,7 +83,7 @@ public OkHttpClient.Builder getBasicHttpClientBuilder() {
     }
 
     private OkHttpClient.Builder getHttpClient(final HashMap<String, String> params) {
-                         return getHttpClient()
+        return getHttpClient()
                 .addInterceptor(new Interceptor() {
                     @Override
                     public okhttp3.Response intercept(Chain chain) throws IOException {