Contact duration and distance

android/core/core/build.gradle

@@ -16,9 +16,14 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments clearPackageData: 'true'
         consumerProguardFiles 'consumer-rules.pro'
     }
 
+    testOptions {
+        execution 'androidx_test_orchestrator'
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -42,6 +47,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestUtil 'androidx.test:orchestrator:1.2.0'
 
     androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.0'
 

android/core/core/src/androidTest/java/org/coepi/core/JNIInterfaceBootstrappedTests.kt

@@ -68,7 +68,7 @@ class JNIInterfaceBootstrappedTests {
 
     @Test
     fun recordTcn() {
-        val value = JniApi().recordTcn("2485a64b57addcaea3ed1b538d07dbce")
+        val value = JniApi().recordTcn("2485a64b57addcaea3ed1b538d07dbce", 34.03f)
         assertEquals(JniVoidResult(1, ""), value)
     }
 

android/core/core/src/main/java/org/coepi/core/jni/JniApi.kt

@@ -21,7 +21,7 @@ class JniApi {
 
     external fun generateTcn(): String
 
-    external fun recordTcn(tcn: String): JniVoidResult
+    external fun recordTcn(tcn: String, distance: Float): JniVoidResult
 
     // TODO test:
     external fun setBreathlessnessCause(cause: String): JniVoidResult

android/core/core/src/main/java/org/coepi/core/services/ObservedTcnsRecorder.kt

@@ -6,11 +6,11 @@ import org.coepi.core.domain.model.Tcn
 import org.coepi.core.domain.common.Result
 
 interface ObservedTcnsRecorder {
-    fun recordTcn(tcn: Tcn): Result<Unit, Throwable>
+    fun recordTcn(tcn: Tcn, distance: Float): Result<Unit, Throwable>
 }
 
 class ObservedTcnsRecorderImpl(private val api: JniApi) :
     ObservedTcnsRecorder {
-    override fun recordTcn(tcn: Tcn): Result<Unit, Throwable> =
-        api.recordTcn(tcn.toHex()).asResult()
+    override fun recordTcn(tcn: Tcn, distance: Float): Result<Unit, Throwable> =
+        api.recordTcn(tcn.toHex(), distance).asResult()
 }

src/android/android_interface.rs

@@ -80,8 +80,9 @@ pub unsafe extern "C" fn Java_org_coepi_core_jni_JniApi_recordTcn(
     env: JNIEnv,
     _: JClass,
     tcn: JString,
+    distance: jfloat,
 ) -> jobject {
-    recordTcn(&env, tcn).to_void_jni(&env)
+    recordTcn(&env, tcn, distance).to_void_jni(&env)
 }
 
 // NOTE: Returns directly success string
@@ -262,11 +263,13 @@ fn fetch_new_reports(env: &JNIEnv) -> Result<jobjectArray, ServicesError> {
     alerts_to_jobject_array(result, &env)
 }
 
-fn recordTcn(env: &JNIEnv, tcn: JString) -> Result<(), ServicesError> {
+fn recordTcn(env: &JNIEnv, tcn: JString, distance: jfloat) -> Result<(), ServicesError> {
     let tcn_java_str = env.get_string(tcn)?;
     let tcn_str = tcn_java_str.to_str()?;
 
-    let result = dependencies().observed_tcn_processor.save(tcn_str);
+    let result = dependencies()
+        .observed_tcn_processor
+        .save(tcn_str, distance as f32);
     info!("Recording TCN result {:?}", result);
 
     result
@@ -485,8 +488,8 @@ impl LogCallbackWrapper for LogCallbackWrapperImpl {
             // Note that if we panic, LogCat will also not show a message, or location.
             // TODO consider writing to file. Otherwise it's impossible to notice this.
             Err(e) => println!(
-                "Couldn't get env: Can't send log: level: {}, text: {}",
-                level, text,
+                "Couldn't get env: Can't send log: level: {}, text: {}, e: {}",
+                level, text, e
             ),
         }
     }

src/ios/ios_interface.rs

@@ -65,9 +65,13 @@ pub unsafe extern "C" fn fetch_new_reports() -> CFStringRef {
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn record_tcn(c_tcn: *const c_char) -> CFStringRef {
+pub unsafe extern "C" fn record_tcn(c_tcn: *const c_char, distance: f32) -> CFStringRef {
     let tcn_str = cstring_to_str(&c_tcn);
-    let result = tcn_str.and_then(|tcn_str| dependencies().observed_tcn_processor.save(tcn_str));
+    let result = tcn_str.and_then(|tcn_str| {
+        dependencies()
+            .observed_tcn_processor
+            .save(tcn_str, distance)
+    });
     info!("Recording TCN result {:?}", result);
     return to_result_str(result);
 }