Skip to content

Commit

Permalink
Remove the toggle for the "experimental" OPGeofence
Browse files Browse the repository at this point in the history
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
  • Loading branch information
shankari committed Mar 28, 2023
1 parent d318f8f commit 2700d9a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion package.cordovabuild.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion www/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 0 additions & 10 deletions www/js/control/general-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
9 changes: 0 additions & 9 deletions www/templates/control/main-control.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 2700d9a

Please sign in to comment.