Merge pull request #286 from vimeo/caching-fix

Fixing Caching
vimeo · Feb 14, 2018 · 9454de5 · 9454de5
2 parents 8eb24fc + ed40329
commit 9454de5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,13 +2,13 @@
 
 buildscript {
     ext.supportLibraryVersion = '26.1.0'
-    ext.kotlin_version = '1.2.20'
+    ext.kotlin_version = '1.2.21'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

diff --git a/example-java-android/src/main/java/com/vimeo/android/networking/example/TestApp.java b/example-java-android/src/main/java/com/vimeo/android/networking/example/TestApp.java
@@ -45,6 +45,10 @@ public void onCreate() {
             configBuilder.enableCertPinning(false);
             configBuilder.setLogLevel(LogLevel.VERBOSE);
         }
+        configBuilder
+                .setCacheDirectory(this.getCacheDir())
+                .setUserAgentString(getUserAgentString(this))
+                .setDebugLogger(new NetworkingLogger());
         VimeoClient.initialize(configBuilder.build());
         // </editor-fold>
     }
@@ -64,8 +68,7 @@ public Configuration.Builder getClientIdAndClientSecretBuilder() {
         TestAccountStore testAccountStore = new TestAccountStore(this.getApplicationContext());
         Configuration.Builder configBuilder =
                 new Configuration.Builder(clientId, clientSecret, SCOPE, testAccountStore);
-        configBuilder.setCacheDirectory(this.getCacheDir())
-                .setUserAgentString(getUserAgentString(this)).setDebugLogger(new NetworkingLogger())
+        configBuilder
                 // Used for oauth flow
                 .setCodeGrantRedirectUri(codeGrantRedirectUri);
 

diff --git a/...ple-kotlin-android/src/main/kotlin/com/vimeo/android/networking/example/kotlin/TestApp.kt b/...ple-kotlin-android/src/main/kotlin/com/vimeo/android/networking/example/kotlin/TestApp.kt
@@ -36,6 +36,10 @@ class TestApp : Application() {
             configBuilder.enableCertPinning(false)
             configBuilder.setLogLevel(LogLevel.VERBOSE)
         }
+        configBuilder
+                .setCacheDirectory(this.cacheDir)
+                .setUserAgentString(getUserAgentString(this))
+                .setDebugLogger(NetworkingLogger())
         VimeoClient.initialize(configBuilder.build())
         // </editor-fold>
     }
@@ -56,8 +60,7 @@ class TestApp : Application() {
             val codeGrantRedirectUri = getString(R.string.deeplink_redirect_scheme) + "://" + getString(R.string.deeplink_redirect_host)
             val testAccountStore = TestAccountStore(this.applicationContext)
             val configBuilder = Configuration.Builder(clientId, clientSecret, SCOPE)
-            configBuilder.setCacheDirectory(this.cacheDir)
-                    .setUserAgentString(getUserAgentString(this)).setDebugLogger(NetworkingLogger())
+            configBuilder
                     .setCodeGrantRedirectUri(codeGrantRedirectUri)
 
             return configBuilder

diff --git a/...o-networking/src/main/java/com/vimeo/networking/interceptors/CacheControlInterceptor.java b/...o-networking/src/main/java/com/vimeo/networking/interceptors/CacheControlInterceptor.java
@@ -40,9 +40,9 @@ public class CacheControlInterceptor implements Interceptor {
 
     @Override
     public Response intercept(Chain chain) throws IOException {
-        return chain.proceed(chain.request()
-                                     .newBuilder()
-                                     .header(Vimeo.HEADER_CACHE_CONTROL, Vimeo.HEADER_CACHE_PUBLIC)
-                                     .build());
+        return chain.proceed(chain.request())
+                .newBuilder()
+                .header(Vimeo.HEADER_CACHE_CONTROL, Vimeo.HEADER_CACHE_PUBLIC)
+                .build();
     }
 }