Merge remote-tracking branch 'official/develop' into self-assessment

* official/develop:
  Fix EULA modal close icon color (Path-Check#792)
  feat(i18n) Language updates, May 10 (Path-Check#790)
  feat(GPS) Store Location Data in an encrypted Realm DB (Path-Check#788)
  Enable location status checks in testing build (Path-Check#787)
  fix(Onboarding) Fix EULA links to open in device browser (Path-Check#783)
  chore(Build) Fix debug build error with apache commons-io lib (Path-Check#775, SAF-210)
  chore(Testing) snapshot tests for LocationTracking,  main/* (Path-Check#785)
  Only render mayo clinic link when language is english (Path-Check#782)
  fix(UX) Fix pulse alignment on Android devices with “notch” (Path-Check#771)
  fix(Location) Improve location "tracking" status checks (Path-Check#749)
  Fix text crop in About screen (Path-Check#774)
  [iOS] add missing languages (Path-Check#773)

.env

@@ -8,4 +8,5 @@
 # flags must begin with flag_ and are case sensitive
 
 flag_google_import=true
-flag_self_assessment=false
+flag_self_assessment=false
+flag_better_location_status_checks=true

.env.beta

@@ -8,4 +8,5 @@
 #
 # ENVFILE=.env.beta ./gradlew assembleRelease
 
+flag_better_location_status_checks=true
 # flag_google_import=true

.github/workflows/test.yml

@@ -42,10 +42,12 @@ jobs:
     # the node_modules caches will conflict
     needs: unit-test
     timeout-minutes: 15
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_11.4.app
     steps:
       - uses: actions/checkout@master
+
+      - name: Set XCode Version
+        run: sudo xcode-select -s /Applications/Xcode_11.app
+
       - name: Cache node_modules/
         uses: actions/cache@v1
         id: cache

.gitignore

@@ -62,7 +62,6 @@ app/locales/*_old.json
 
 # CocoaPods
 /ios/Pods/
-yarn.lock
 .vscode/launch.json
 ios/Podfile.lock
 

README.md

@@ -37,7 +37,7 @@ Safe Paths is a ‘privacy-first’ app that allows you to log your GPS trails o
 
 The location log generated by Safe Paths cannot be accessed from outside the user’s device. However, the user can import and export their location information and use it in other projects and applications.
 
-Safe Paths logs your device’s location once every five minutes and stores 28 days of data in under 100KB of space.
+Safe Paths logs your device’s location once every five minutes and stores 14 days of data.
 
 ### Private Kit WhitePaper
 

__mocks__/@react-native-community/async-storage.js

@@ -0,0 +1 @@
+export default from '@react-native-community/async-storage/jest/async-storage-mock';

__tests__/App.spec.js

@@ -3,14 +3,17 @@
  */
 
 import 'react-native';
+import 'isomorphic-fetch';
+
+import { render } from '@testing-library/react-native';
 import React from 'react';
+
 import App from '../App';
-import {render} from '@testing-library/react-native';
 
 jest.mock('../app/Entry', () => 'Entry');
 
 it('renders correctly', () => {
-  const {asJSON} = render(<App />);
+  const { asJSON } = render(<App />);
 
   expect(asJSON()).toMatchSnapshot();
 });

android/app/build.gradle

@@ -1,4 +1,8 @@
 apply plugin: "com.android.application"
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'realm-android'
 
 project.ext.envConfigFiles = [
     debug: ".env",
@@ -208,6 +212,8 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation "androidx.annotation:annotation:1.1.0"
+    implementation project(':@mauron85_react-native-background-geolocation-common')
+    implementation 'com.bottlerocketstudios:vault:1.4.2'
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/"
@@ -216,16 +222,14 @@ dependencies {
     } else {
         implementation jscFlavor
     }
-    androidTestImplementation('com.wix:detox:+')  // detox: e2e testing
+    androidTestImplementation('com.wix:detox:+') // detox: e2e testing
+    implementation "androidx.core:core-ktx:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 allprojects {
     repositories {
         configurations.all {
-            // Fixes dependency conflict between react-native-local-assets and
-            // @mauron85/react-native-background-geolocation
-            exclude group: "commons-io", module: "commons-io"
-
             // To fix the app start crash error
             resolutionStrategy.eachDependency { DependencyResolveDetails details ->
                 def requested = details.requested
@@ -252,3 +256,6 @@ task copyDownloadableDepsToLibs(type: Copy) {
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+repositories {
+  mavenCentral()
+}

android/app/src/androidTest/java/org/pathcheck/covidsafepaths/storage/LocationTest.kt

@@ -0,0 +1,22 @@
+package org.pathcheck.covidsafepaths.storage
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class LocationTest {
+
+  @Test
+  fun northAndSouthPolesNotNearby() {
+    assertFalse(Location.areLocationsNearby(90.0, 0.0, -90.0, 0.0))
+  }
+
+  @Test
+  fun newYorkAndSydneyNotNearby() {
+    assertFalse(Location.areLocationsNearby(40.7128, -74.006, -33.8688, 151.2093))
+  }
+
+  @Test
+  fun spotsInKansasCityAreNearby() {
+    assertTrue(Location.areLocationsNearby(39.09772, -94.582959, 39.097769, -94.582937))
+  }
+}