From 2700d9a9de31f6e225650c512d3b9cfc0c8e1b88 Mon Sep 17 00:00:00 2001
From: "K. Shankari" <shankari@eecs.berkeley.edu>
Date: Mon, 27 Mar 2023 22:48:10 -0700
Subject: [PATCH 1/2] Remove the toggle for the "experimental" OPGeofence

Since it is no longer experimental
- Native code change to stop checking for it
- UI changes to remove the button from the control screen
- Remove the toggle function from the javascript
- Remove the translation from i18n
---
 package.cordovabuild.json               |  2 +-
 www/i18n/en.json                        |  1 -
 www/js/control/general-settings.js      | 10 ----------
 www/templates/control/main-control.html |  9 ---------
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/package.cordovabuild.json b/package.cordovabuild.json
index d067bc1ae..f21d7c89e 100644
--- a/package.cordovabuild.json
+++ b/package.cordovabuild.json
@@ -73,7 +73,7 @@
     "cordova-plugin-app-version": "0.1.14",
     "cordova-plugin-customurlscheme": "5.0.2",
     "cordova-plugin-device": "2.1.0",
-    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.6",
+    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.7",
     "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.1",
     "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.5",
     "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.1",
diff --git a/www/i18n/en.json b/www/i18n/en.json
index c2a793e0c..57b19aebf 100644
--- a/www/i18n/en.json
+++ b/www/i18n/en.json
@@ -55,7 +55,6 @@
         "edit-demographics": "Edit Demographics",
         "username": "Username {{usernamedata}}",
         "tracking": "Tracking",
-        "enable-opgeofence": "Experimental trip start",
         "app-status": "App Status",
         "medium-accuracy": "Medium accuracy",
         "dark-theme": "Dark theme",
diff --git a/www/js/control/general-settings.js b/www/js/control/general-settings.js
index f358c18ac..f50e43f8c 100644
--- a/www/js/control/general-settings.js
+++ b/www/js/control/general-settings.js
@@ -469,16 +469,6 @@ angular.module('emission.main.control',['emission.services',
         }
     }
 
-    $scope.toggleExperimentalGeofence = function() {
-        Logger.log("Toggling experimental geofence from current state of "+$scope.settings.collect.experimentalGeofenceOn);
-        if ($scope.settings.collect.experimentalGeofenceOn) {
-            KVStore.remove("OP_GEOFENCE_CFG");
-            return ControlCollectionHelper.forceTransition('INITIALIZE');
-        } else {
-            KVStore.set("OP_GEOFENCE_CFG", {"enabled": true});
-            return ControlCollectionHelper.forceTransition('INITIALIZE');
-        }
-    }
     $scope.getExpandButtonClass = function() {
         return ($scope.expanded)? "icon ion-ios-arrow-up" : "icon ion-ios-arrow-down";
     }
diff --git a/www/templates/control/main-control.html b/www/templates/control/main-control.html
index ac1e21964..0ead0c751 100644
--- a/www/templates/control/main-control.html
+++ b/www/templates/control/main-control.html
@@ -22,15 +22,6 @@
         </div>
       </label>
     </div>
-    <div class="control-list-item">
-      <div class="control-list-text" translate>{{'.enable-opgeofence'}}</div>
-      <label ng-click="toggleExperimentalGeofence()" class="toggle control-list-toggle toggle-color">
-        <input type="checkbox" ng-checked="settings.collect.experimentalGeofenceOn">
-        <div class="track">
-          <div class="handle"></div>
-        </div>
-      </label>
-    </div>
     <div class="control-list-item">
       <div class="control-list-text" translate>{{'.app-status'}}</div>
       <div ng-click="fixAppStatus()" class="control-icon-button"><i class="ion-checkmark"></i></div>

From 9ebf1895a9e0249410103883f3d04f3e1e76b9ce Mon Sep 17 00:00:00 2001
From: "K. Shankari" <shankari@eecs.berkeley.edu>
Date: Mon, 27 Mar 2023 22:49:41 -0700
Subject: [PATCH 2/2] Add space at the end of the string

to format it better
---
 www/js/intro.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/js/intro.js b/www/js/intro.js
index 4cc310679..b853b2543 100644
--- a/www/js/intro.js
+++ b/www/js/intro.js
@@ -170,7 +170,7 @@ angular.module('emission.intro', ['emission.splash.startprefs',
               Logger.log("From QR code, extracted token "+extractedToken);
               $scope.login(extractedToken);
           } else {
-              $ionicPopup.alert({template: "invalid token format"+result.text});
+              $ionicPopup.alert({template: "invalid token format "+result.text});
           }
       },
       function (error) {