Merge pull request #455 from cds-snc/issue/453/android-bridge-detect-…

…timeout Increase detect exposure timeout and disable lastCheckPeriod on Android
cds-snc · Jul 6, 2020 · a63aec0 · a63aec0
2 parents abd50f4 + 63833fc
commit a63aec0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/android/app/src/main/java/app/covidshield/module/ExposureNotificationModule.kt b/android/app/src/main/java/app/covidshield/module/ExposureNotificationModule.kt
@@ -44,7 +44,7 @@ private typealias Token = String
 private const val START_RESOLUTION_FOR_RESULT_REQUEST_CODE = 9001
 private const val GET_TEK_RESOLUTION_FOR_RESULT_REQUEST_CODE = 9002
 
-private const val DETECT_EXPOSURE_TIMEOUT = 20000L
+private const val DETECT_EXPOSURE_TIMEOUT = 30000L
 
 class ExposureNotificationModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context), CoroutineScope, ActivityResultHelper, ExposureNotificationBroadcastReceiver.Helper {
 

diff --git a/src/services/ExposureNotificationService/ExposureNotificationService.ts b/src/services/ExposureNotificationService/ExposureNotificationService.ts
@@ -1,3 +1,4 @@
+import {Platform} from 'react-native';
 import ExposureNotification, {ExposureSummary, Status as SystemStatus} from 'bridge/ExposureNotification';
 import PushNotification from 'bridge/PushNotification';
 import {addDays, daysBetween, periodSinceEpoch} from 'shared/date-fns';
@@ -261,7 +262,12 @@ export class ExposureNotificationService {
       if (done) break;
       if (!value) continue;
       const {keysFileUrl, period} = value;
-      lastCheckedPeriod = Math.max(lastCheckedPeriod || 0, period);
+
+      // Temporarily disable persisting lastCheckPeriod on Android
+      // Ref https://github.com/cds-snc/covid-shield-mobile/issues/453
+      if (Platform.OS !== 'android') {
+        lastCheckedPeriod = Math.max(lastCheckedPeriod || 0, period);
+      }
 
       try {
         const summary = await this.exposureNotification.detectExposure(exposureConfiguration, [keysFileUrl]);