Merge pull request #16 from shankari/release_v120

Changes for release 1.2.0

Author: shankari

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="7" id="edu.berkeley.eecs.embase" ios-CFBundleVersion="7" version="1.1.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="8" id="edu.berkeley.eecs.embase" ios-CFBundleVersion="8" version="1.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>emTripLog</name>
     <description>
         Base version of the e-mission app, intended for customization by studies.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "edu.berkeley.eecs.embase",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "displayName": "emTripLog",
   "cordova": {
     "platforms": [

www/js/splash/updatecheck.js

@@ -153,7 +153,21 @@ angular.module('emission.splash.updatecheck', ['emission.plugin.logger',
           reloadAlert.then(function(res) {
             uc.redirectPromise();
           });
-      });
+      }).catch(function(err) {
+        $rootScope.isDownloading = false;
+        extractPop.close();
+        $ionicPopup.alert({
+            title: "Extraction error",
+            message: JSON.stringify(err)
+        });
+      })
+    }).catch(function(err) {
+        $rootScope.isDownloading = false;
+        downloadPop.close();
+        $ionicPopup.alert({
+            title: "Download error",
+            message: JSON.stringify(err)
+        });
     });
   };
 
@@ -198,6 +212,7 @@ angular.module('emission.splash.updatecheck', ['emission.plugin.logger',
     })
     })
     }).catch(function(err) {
+      $rootScope.isDownloading = false;
       Logger.log('Ionic Deploy: Unable to check for updates'+err);
       console.error('Ionic Deploy: Unable to check for updates',err)
     })