merge tail

Author: SagivOnoApps

ios/Podfile.lock

@@ -597,8 +597,8 @@ SPEC CHECKSUMS:
   lottie-ios: 85ce835dd8c53e02509f20729fc7d6a4e6645a0a
   lottie-react-native: 2a1a82bb326ae51331a5520de0cf706733c6db69
   nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
-  Permission-LocationAlways: 3b72f964c0cb5a93b3fee0954f502af959347676
-  Permission-Motion: fea5018dfe8f0892768169041e559870ffd3ac30
+  Permission-LocationAlways: 738e3b24333d52c87361804bb0a1641de014c405
+  Permission-Motion: 6d251146daf1102ebe143a2618adc18946353ad2
   Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
@@ -609,18 +609,18 @@ SPEC CHECKSUMS:
   React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
   React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
   React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
-  react-native-background-timer: 53c0e028a95d58b1f4498ef7ce152b6c6b337595
+  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
   react-native-cookies: bc1f91a504ee091f1998a1b6c7ff4b7a9ed5b80e
   react-native-google-maps: 0a989abda71059db2caa98b9dacca7a8f38a47d0
   react-native-maps: f4b89da81626ad7f151a8bfcb79733295d31ce5c
-  react-native-netinfo: c67896313964727ddae153d6e119f65dae840d51
+  react-native-netinfo: 73303369946c2487c600418961bfdc87748b832f
   react-native-network-info: d1290ffc0bd0709e11436f5b8d7f605dcc5c4530
-  react-native-safe-area-context: 8260e5157617df4b72865f44006797f895b2ada7
-  react-native-settings: 6fc0f38956f8e46460e01c97db7ec3d018f2fdc1
+  react-native-safe-area-context: e200d4433aba6b7e60b52da5f37af11f7a0b0392
+  react-native-settings: 67977214c0f7d6062ad25581107c16a7a27af2a8
   react-native-splash-screen: f15e2d96fd6afc5c882b1dd0b443d07295e2c7c5
-  react-native-sqlite-storage: bb10beb2407e5fc21f3f1bcd86bacbfd6edcc818
-  react-native-uuid-generator: 997d9848f07081ce7200a05b76e3f8c7b309963c
-  react-native-webview: 0e2881d2e3e72ad52a82445c1a116c43205fd471
+  react-native-sqlite-storage: f06bfba10f67f989c00b6a699b9c2b80a816edbe
+  react-native-uuid-generator: 82ffa2a1cac94242ebed52c4dedc5044d3412717
+  react-native-webview: cf5527893252b3b036eea024a1da6996f7344c74
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -633,18 +633,18 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   rn-contact-tracing: fe147c2be110646d1aa401e15c0065ad1bc25fd8
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
-  RNBackgroundFetch: 08bdaaa13a5aa71cdce42068def5602ed1e982c2
-  RNBackgroundGeolocation: 0ece4eb8306b1e0acc7571fa9394d71bfa42a53b
-  RNCAsyncStorage: 8539fc80a0075fcc9c8e2dff84cd22dc5bf1dacf
-  RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
-  RNDeviceInfo: d0fff8432ccdf276cb342a52e665ea6dd311472e
+  RNBackgroundFetch: 8d8d66b47eafcb9e772b2eb95057939038b3ef95
+  RNBackgroundGeolocation: 8f0a20788100fbf08987d80f2053ae6eba79c566
+  RNCAsyncStorage: 44395cb9c7c1523104c2b499eb426ef7aff82bca
+  RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
+  RNDeviceInfo: c7b1dc457611b9231bb780a882102e2c93edc7af
   RNFirebase: 37daa9a346d070f9f6ee1f3b4aaf4c8e3b1d5d1c
   RNGestureHandler: 946a7691e41df61e2c4b1884deab41a4cdc3afff
-  RNPermissions: 8afd37dbc1be65748363c6a90caffd1806567651
+  RNPermissions: 1008d3511fee0e25739cf81c4af0d1b2248f1053
   RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c
   RNScreens: 5e4758109c6d35f9a009ce72af873df907548020
-  RNSha1: de3932b60b290175271295fba58a05ac4a0206c6
-  RNWifi: 04dc95466c8f63b7f6ba889b0d05f62b7d1c234e
+  RNSha1: 6de589cd0b0397d0f6248a2e5ee9e5f0d7da38dc
+  RNWifi: 1747f039612dd494192ba6c8bc498606ad9f3ec4
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
 PODFILE CHECKSUM: c85d4a94c29bc88bc3f697f6b2b5831cdd10d31a

ios/codeAgainstCorona.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

src/database/Database.js

@@ -527,7 +527,8 @@ export class IntersectionSickDatabase {
                 record.properties.fromTime_utc,
                 record.properties.toTime_utc,
                 record.geometry.coordinates[config().sickGeometryLongIndex],
-                record.geometry.coordinates[config().sickGeometryLatIndex]
+                record.geometry.coordinates[config().sickGeometryLatIndex],
+                null
               ]);
 
             resolve(results);

src/services/BLEService.ts

@@ -79,3 +79,14 @@ export const match = () => {
     Alert.alert('No results found');
   });
 };
+
+// return mock BLE timeStamp
+export const matchMock = async (fetchedArr) => {
+  return new Date().getTime()
+}
+
+// return mock fetch array of things 
+export const fetchMock = () => {
+  //  SpecialBle.fetch()
+  return ['asd', 'asdfsad', 'asdsdf']
+}

src/services/Tracker.ts

@@ -12,6 +12,7 @@ import config from '../config/config';
 import store from '../store';
 import { Cluster, Exposure, Location, SickJSON } from '../types';
 import { LAST_FETCH_TS } from '../constants/Constants';
+import { matchMock } from './BLEService';
 
 // tslint:disable-next-line:no-var-requires
 const haversine = require('haversine');
@@ -32,6 +33,27 @@ export const queryDB = async (isClusters: boolean) => {
   return rows;
 };
 
+export const checkBLEMatch = async () => {
+  try {
+    const fetched = await fetchMock()
+    if (fetched) {
+      const bleTS = await matchMock(fetched)
+      if(bleTS) {
+      
+        const sickDB = new IntersectionSickDatabase();
+
+        // check if ble time stamp exists in db
+        if(false) {
+          
+        }
+      }
+
+    }
+  } catch (error) {
+    onError(error);
+  }
+}
+
 export const checkSickPeople = async () => {
   try {
     const lastFetch = JSON.parse((await AsyncStorage.getItem(LAST_FETCH_TS)) || '0');
@@ -143,7 +165,7 @@ export const isTimeOverlapping = (userRecord: Location, sickRecord: Exposure) =>
   );
 };
 
-export const isSpaceOverlapping = (clusterOrLocation: Location|Cluster, { properties: { radius }, geometry: { coordinates } }: Exposure) => {
+export const isSpaceOverlapping = (clusterOrLocation: Location | Cluster, { properties: { radius }, geometry: { coordinates } }: Exposure) => {
   const start = {
     latitude: clusterOrLocation.lat,
     longitude: clusterOrLocation.long,

yarn.lock

@@ -7220,9 +7220,9 @@ rimraf@~2.2.6:
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
   integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
-"rn-contact-tracing@git+https://github.com/wix-incubator/rn-contact-tracing.git#iOS-Crypto":
+"rn-contact-tracing@git+https://github.com/wix-incubator/rn-contact-tracing.git#master":
   version "0.0.3"
-  resolved "git+https://github.com/wix-incubator/rn-contact-tracing.git#b0f403905d13c77e6378bdbdf0210821025c852e"
+  resolved "git+https://github.com/wix-incubator/rn-contact-tracing.git#90b1060ca0c8b321283b499f49fae09b4608a42e"
 
 [email protected]:
   version "0.12.0"