Merge branch 'fix-9.3'

UweTrottmann · Nov 13, 2013 · da520d4 · da520d4
2 parents ef5e218 + 61a46c1
commit da520d4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 9.3 *(2013-11-13)*
+--------------------------
+
+Disable encryption when talking to GetGlue. Android can't validate the certificate chain (either certificates were switched or RC 128 encryption is not supported).
+
 Version 9.1 *(2013-11-12)*
 --------------------------
 

diff --git a/SeriesGuide/build.gradle b/SeriesGuide/build.gradle
@@ -19,8 +19,8 @@ android {
     productFlavors {
         free {
             packageName "com.battlelancer.seriesguide"
-            versionCode 191
-            versionName "9.2"
+            versionCode 192
+            versionName "9.3"
         }
         beta {
             packageName "com.battlelancer.seriesguide.beta"

diff --git a/SeriesGuide/libs/getglue-java-1.1.0.jar → SeriesGuide/libs/getglue-java-1.1.1.jar b/SeriesGuide/libs/getglue-java-1.1.0.jar → SeriesGuide/libs/getglue-java-1.1.1.jar
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/getglueapi/GetGlueAuthActivity.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/getglueapi/GetGlueAuthActivity.java
@@ -106,6 +106,9 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
 
         // mWebview.getSettings().setJavaScriptEnabled(true);
 
+        // make sure we start fresh
+        mWebview.clearCache(true);
+
         Log.d(TAG, "Initiating authorization request...");
         Resources res = getResources();
         try {