Merge pull request #173 from shankari/implement_runtime_permissions

Minor fix to collect_settings.js

package.json

@@ -1,7 +1,7 @@
 {
   "name": "e-mission-data-collection",
-  "version": "1.3.2",
-  "description": "Simple package that stores all the connection settings that need to be configured",
+  "version": "1.3.3",
+  "description": "The main tracking for the e-mission platform",
   "cordova": {
     "id": "e-mission-data-collection",
     "platforms": [

plugin.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
         id="edu.berkeley.eecs.emission.cordova.datacollection"
-        version="1.3.2">
+        version="1.3.3">
 
   <name>DataCollection</name>
   <description>Background data collection FTW! This is the part that I really

www/ui/ionic/js/collect-settings.js

@@ -128,11 +128,13 @@ angular.module('emission.main.control.collection', [])
 
     cch.forceTransition = function(transition) {
         cch.forceTransitionWrapper(transition).then(function(result) {
-            $rootScope.$broadcast('control.update.complete', 'forceTransition');
-            $ionicPopup.alert({template: 'success -> '+result});
+            $ionicPopup.alert({template: 'success -> '+result}).then(function() {
+                $rootScope.$broadcast('control.update.complete', 'forceTransition');
+            });
         }, function(error) {
-            $rootScope.$broadcast('control.update.complete', 'forceTransition');
-            $ionicPopup.alert({template: 'error -> '+error});
+            $ionicPopup.alert({template: 'error -> '+error}).then(function() {
+                $rootScope.$broadcast('control.update.complete', 'forceTransition');
+            });
         });
     };