Merge pull request #1144 from shankari/simulate_ble_scans

Expand the profile screen to simulate bluetooth actions separately and handle them properly in the native code

package.cordovabuild.json

@@ -121,13 +121,13 @@
     "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.8.3",
+    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.8.5",
     "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.2",
     "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.6",
     "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.2",
     "cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.3",
     "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.6",
-    "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.8",
+    "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.9",
     "cordova-plugin-email-composer": "git+https://github.com/katzer/cordova-plugin-email-composer.git#0.10.1",
     "cordova-plugin-file": "8.0.0",
     "cordova-plugin-inappbrowser": "5.0.0",

www/js/bluetooth/BluetoothScanPage.tsx

@@ -97,7 +97,6 @@ const BluetoothScanPage = ({ ...props }: any) => {
         in_range: status,
       },
     }));
-    let { monitorResult: _, in_range: _, ...noResultDevice } = sampleBLEDevices[uuid];
     window['cordova']?.plugins?.BEMDataCollection.mockBLEObjects(
       status ? 'REGION_ENTER' : 'REGION_EXIT',
       uuid,
@@ -118,16 +117,6 @@ const BluetoothScanPage = ({ ...props }: any) => {
         rangeResult: result,
       },
     }));
-    // we don't want to exclude monitorResult and rangeResult from the values
-    // that we save because they are the current or previous result, just
-    // in a different format
-    // https://stackoverflow.com/a/34710102
-    let {
-      monitorResult: _,
-      rangeResult: _,
-      in_range: _,
-      ...noResultDevice
-    } = sampleBLEDevices[uuid];
     let parsedResult = JSON.parse(result);
     parsedResult.beacons.forEach((beacon) => {
       window['cordova']?.plugins?.BEMDataCollection.mockBLEObjects(

www/js/usePermissionStatus.ts

@@ -291,6 +291,41 @@ const usePermissionStatus = () => {
     setCheckList(tempChecks);
   }
 
+  function setupAndroidBluetoothChecks() {
+    if (window['device'].version.split('.')[0] >= 10) {
+      let fixPerms = () => {
+        logDebug('fix and refresh bluetooth permissions');
+        return checkOrFix(
+          bluetoothPermissionsCheck,
+          window['cordova'].plugins.BEMDataCollection.fixBluetoothPermissions,
+          true,
+        ).then((error) => {
+          if (error) {
+            bluetoothPermissionsCheck.desc = error;
+          }
+        });
+      };
+      let checkPerms = () => {
+        logDebug('fix and refresh bluetooth permissions');
+        return checkOrFix(
+          bluetoothPermissionsCheck,
+          window['cordova'].plugins.BEMDataCollection.isValidBluetoothPermissions,
+          false,
+        );
+      };
+
+      let bluetoothPermissionsCheck = {
+        name: 'Bluetooth scan permission',
+        desc: 'Scan for BLE beacons to automatically match trips to vehicles',
+        fix: fixPerms,
+        refresh: checkPerms,
+      };
+      let tempChecks = checkList;
+      tempChecks.push(bluetoothPermissionsCheck);
+      setCheckList(tempChecks);
+    }
+  }
+
   function setupAndroidNotificationChecks() {
     let fixPerms = () => {
       logDebug('fix and refresh notification permissions');
@@ -409,6 +444,9 @@ const usePermissionStatus = () => {
     if (window['device'].platform.toLowerCase() == 'android') {
       setupAndroidLocChecks();
       setupAndroidFitnessChecks();
+      if (appConfig.tracking?.bluetooth_only) {
+        setupAndroidBluetoothChecks();
+      }
       setupAndroidNotificationChecks();
       setupAndroidBackgroundRestrictionChecks();
     } else if (window['device'].platform.toLowerCase() == 'ios') {