Merge pull request #68 from CruGlobal/v4.1.3

v4.1.3 Support Release
CruGlobal · Oct 23, 2015 · d6a0242 · d6a0242
2 parents aa1887e + e7ce5dd
commit d6a0242
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.keynote.godtools.android"
-    android:versionCode="18"
-    android:versionName="4.1.2"
+    android:versionCode="19"
+    android:versionName="4.1.3"
     android:installLocation="preferExternal">
 
     <application
@@ -140,7 +140,7 @@
 
     <uses-sdk
         android:minSdkVersion="10"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
     <supports-screens
         android:smallScreens="false"
         android:resizeable="false" />

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ repositories {
 dependencies {
     // some dependencies will not be updated as these particular versions are needed by the app.
     //noinspection GradleDynamicVersion,GradleDependency
-    compile 'com.android.support:appcompat-v7:19.1.+'
+    compile 'com.android.support:appcompat-v7:22.2.0'
     compile fileTree(dir: 'libs', include: '*.jar')
     //noinspection GradleDependency
     compile 'com.google.android.gms:play-services:4.3.23'
@@ -32,8 +32,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

diff --git a/res/layout-v14/settings.xml → res/layout/settings.xml b/res/layout-v14/settings.xml → res/layout/settings.xml
@@ -215,7 +215,7 @@
             android:layout_alignParentStart="true"
             android:background="#ffffffff"/>
 
-        <Switch
+        <android.support.v7.widget.SwitchCompat
             android:background="#00ffffff"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
@@ -274,7 +274,7 @@
             android:layout_alignParentStart="true"
             android:background="#ffffffff"/>
 
-        <Switch
+        <android.support.v7.widget.SwitchCompat
             android:background="#00ffffff"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"

diff --git a/src/org/keynote/godtools/android/http/DownloadTask.java b/src/org/keynote/godtools/android/http/DownloadTask.java
@@ -23,8 +23,6 @@
 import java.net.URL;
 import java.util.List;
 
-import io.fabric.sdk.android.services.common.Crash;
-
 public class DownloadTask extends AsyncTask<Object, Void, Boolean> {
 
     private DownloadTaskHandler mTaskHandler;
@@ -50,19 +48,28 @@ protected Boolean doInBackground(Object... params) {
         tag = params[2].toString();
         String authorization = (String) params[3];
         langCode = params[4].toString();
+        int downloadResponseCode = -1;
+        int downloadContentLength = -1;
 
         try {
 
             HttpURLConnection connection = getHttpURLConnection(url, authorization);
 
             connection.connect();
 
+            downloadResponseCode = connection.getResponseCode();
+            downloadContentLength = connection.getContentLength();
+
             DataInputStream dis = new DataInputStream(connection.getInputStream());
 
             File zipfile = new File(filePath);
             String parentDir = zipfile.getParent();
             File unzipDir = new File(parentDir);
-            unzipDir.mkdirs();
+
+            if(!(unzipDir.mkdirs() && unzipDir.isDirectory()))
+            {
+                throw new RuntimeException("Unable to create directory");
+            }
 
             byte[] buffer = new byte[2048];
             int length;
@@ -130,6 +137,14 @@ protected Boolean doInBackground(Object... params) {
             return true;
 
         } catch (Exception e) {
+            Crashlytics.setString("url", url);
+            Crashlytics.setString("filePath", filePath);
+            Crashlytics.setString("tag", tag);
+            Crashlytics.setString("authorization", authorization);
+            Crashlytics.setString("langCode", langCode);
+            Crashlytics.setString("downloadResponseStatus", Integer.toString(downloadResponseCode));
+            Crashlytics.setString("downloadContentLength", Integer.toString(downloadContentLength));
+
             Crashlytics.logException(e);
             return false;
         }