Merge pull request #540 from shankari/release_v280

Prepare for releasing version 2.8.0

bin/gradle_workaround.py

@@ -0,0 +1,39 @@
+import fileinput
+import argparse
+import logging
+
+BUILD_GRADLE = "platforms/android/build.gradle"
+# BUILD_GRADLE = "/tmp/build.gradle"
+LINE_BEFORE = "// PLUGIN GRADLE EXTENSIONS END"
+OUR_ADD_REMOVE_LINE = 'apply from: "cordova-plugin-crosswalk-webview/xwalk6-workaround.gradle"'
+
+def add_gradle_line():
+    for line in fileinput.input(BUILD_GRADLE, inplace=True):
+        line = line.strip("\n")
+        print(line)
+        if line == LINE_BEFORE:
+            print(OUR_ADD_REMOVE_LINE)
+
+def remove_gradle_line():
+    for line in fileinput.input(BUILD_GRADLE, inplace=True):
+        line = line.strip("\n")
+        if line == OUR_ADD_REMOVE_LINE:
+            pass
+        else:
+            print(line)
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    group = parser.add_mutually_exclusive_group(required=True)
+
+    group.add_argument("-a", "--add", action="store_true",
+        help="add the xwalk line to build.gradle")
+    group.add_argument("-r", "--remove", action="store_true",
+        help="remove the xwalk line from build.gradle")
+
+    args = parser.parse_args()
+
+    if args.add:
+        add_gradle_line()
+    if args.remove:
+        remove_gradle_line()

config.cordovabuild.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="37" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="37" version="2.7.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="38" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="38" version="2.8.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>emission</name>
     <description>
         A commute pattern tracker and carbon footprint estimator.

package.cordovabuild.json

@@ -1,6 +1,6 @@
 {
   "name": "edu.berkeley.eecs.emission",
-  "version": "2.5.0",
+  "version": "2.8.0",
   "displayName": "emission",
   "scripts": {
     "setup-serve": "./bin/download_settings_controls.js",

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)
     })