Bugs/exposure key count

android/app/src/main/java/org/pathcheck/covidsafepaths/MainActivity.java

@@ -21,7 +21,7 @@ public class MainActivity extends ReactActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    SplashScreen.show(this, R.style.SplashTheme);
+    SplashScreen.show(this);
     super.onCreate(savedInstanceState);
 
     bluetoothHelper = new BluetoothHelper(new BluetoothHelper.BluetoothCallback() {

ios/BT/ExposureManager.swift

@@ -209,7 +209,7 @@ final class ExposureManager: NSObject {
 
   typealias ExposureKeysDictionaryArray = [[String: Any]]
 
-  /// Requests the temporary exposure keys used by this device to share with a server. Returns an array of the exposures keys as dictionary or and error if the underlying API fails
+  /// Requests the temporary exposure keys used by this device to share with a server. Returns an array of the exposures keys as dictionary or an error if the underlying API fails
   @objc func fetchExposureKeys(callback: @escaping (ExposureKeysDictionaryArray?, ExposureManagerError?) -> Void) {
     getDiagnosisKeys(transform: { (keys) -> ExposureKeysDictionaryArray in
       (keys ?? []).map { $0.asDictionary }

package.json

@@ -65,7 +65,7 @@
     "react-native-safe-area-context": "^3.1.9",
     "react-native-screens": "^2.16.1",
     "react-native-simple-crypto": "^0.2.15",
-    "react-native-splash-screen": "^3.2.0",
+    "react-native-splash-screen": "^3.3.0",
     "react-native-static-safe-area-insets": "^2.1.1",
     "react-native-svg": "^12.0.3",
     "react-native-webview": "^11.2.0",

src/ExposureContext.tsx

@@ -17,7 +17,10 @@ import * as NativeModule from "./gaen/nativeModule"
 type Posix = number
 
 export interface ExposureState {
+  exposureKeyDate: Date
+  exposureKeyCheckCount: number
   exposureInfo: ExposureInfo
+  exposureKeys: ExposureKey[]
   getCurrentExposures: () => Promise<ExposureInfo>
   getExposureKeys: () => Promise<ExposureKey[]>
   getRevisionToken: () => Promise<string>
@@ -28,6 +31,9 @@ export interface ExposureState {
 }
 
 const initialState = {
+  exposureKeyDate: new Date(),
+  exposureKeyCheckCount: 0,
+  exposureKeys: [],
   exposureInfo: [],
   getCurrentExposures: () => {
     return Promise.resolve([])
@@ -51,9 +57,13 @@ const initialState = {
 export const ExposureContext = createContext<ExposureState>(initialState)
 
 const ExposureProvider: FunctionComponent = ({ children }) => {
+  console.log("exposurePRovider start")
   const { trackEvent } = useProductAnalyticsContext()
 
   const [exposureInfo, setExposureInfo] = useState<ExposureInfo>([])
+  const [exposureKeyDate, setExposureKeyDate] = useState<Date>(new Date())
+  const [exposureKeyCheckCount, setExposureKeyCheckCount] = useState<number>(0)
+  const [exposureKeys, setExposureKeys] = useState<ExposureKey[]>([])
 
   const [
     lastExposureDetectionDate,
@@ -95,6 +105,38 @@ const ExposureProvider: FunctionComponent = ({ children }) => {
     setLastExposureDetectionDate(detectionDate)
   }, [])
 
+  const getExposureKeys = useCallback(async (): Promise<ExposureKey[]> => {
+    const newDate = new Date()
+    // reset if date bad
+    if (exposureKeyDate.getUTCDate() != newDate.getUTCDate()) {
+      console.log("resetting keys date")
+      setExposureKeyCheckCount(0)
+    }
+
+    // ensure date is set
+    setExposureKeyDate(newDate)
+
+    // if date is less than 3 grab it
+    if (exposureKeyCheckCount < 3) {
+      console.log("getting new keys")
+      // increment key check count
+      setExposureKeyCheckCount(exposureKeyCheckCount + 1)
+
+      //get keys
+      const keys = await NativeModule.getExposureKeys()
+
+      //set keys
+      setExposureKeys(keys)
+
+      return keys || []
+    }
+
+    console.log("returning cached keys")
+
+    // fall through return keys in state
+    return exposureKeys || []
+  }, [])
+
   const detectExposures = async (): Promise<NativeModule.DetectExposuresResponse> => {
     const response = await NativeModule.detectExposures()
     if (response.kind === "success") {
@@ -141,12 +183,15 @@ const ExposureProvider: FunctionComponent = ({ children }) => {
   return (
     <ExposureContext.Provider
       value={{
+        exposureKeyDate,
+        exposureKeyCheckCount,
+        exposureKeys,
         exposureInfo,
         lastExposureDetectionDate,
         refreshExposureInfo,
         detectExposures,
         getCurrentExposures: NativeModule.getCurrentExposures,
-        getExposureKeys: NativeModule.getExposureKeys,
+        getExposureKeys,
         getRevisionToken: NativeModule.getRevisionToken,
         storeRevisionToken: NativeModule.storeRevisionToken,
       }}

src/factories/exposureContext.tsx

@@ -2,7 +2,10 @@ import { Factory } from "fishery"
 import { ExposureState } from "../ExposureContext"
 
 export default Factory.define<ExposureState>(() => ({
+  exposureKeyDate: new Date(),
+  exposureKeyCheckCount: 0,
   exposureInfo: [],
+  exposureKeys: [],
   getCurrentExposures: () => Promise.resolve([]),
   getExposureKeys: () => Promise.resolve([]),
   lastExposureDetectionDate: null,

yarn.lock

@@ -7283,9 +7283,10 @@ react-native-simple-crypto@^0.2.15:
     base64-js "^1.3.0"
     hex-lite "^1.5.0"
 
-react-native-splash-screen@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#d47ec8557b1ba988ee3ea98d01463081b60fff45"
+react-native-splash-screen@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.3.0.tgz#3af71ed17afe50fee69590a45aec399d071ead02"
+  integrity sha512-rGjt6HkoSXxMqH4SQUJ1gnPQlPJV8+J47+4yhgTIan4bVvAwJhEeJH7wWt9hXSdH4+VfwTS0GTaflj1Tw83IhA==
 
 react-native-static-safe-area-insets@^2.1.1:
   version "2.1.1"