Symptom fix (#150)

* add error logs for invalid symptom inputs * SymptomInputsManager.kt: copy/pase errors fixed * Cargo.toml: version, authors update
Co-Epi · Aug 23, 2020 · ff0cefc · ff0cefc
1 parent 663c4f9
commit ff0cefc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "coepi_core"
-version = "0.1.0"
-authors = ["theseriousadult <jack@gallabytes.com>, ivanschuetz <ivanhp978@gmail.com>"]
+version = "0.1.35"
+authors = ["theseriousadult <jack@gallabytes.com>, ivanschuetz <ivanhp978@gmail.com>, duskoo <dusko.ojdanic@gmail.com>"]
 edition = "2018"
 
 [lib]

diff --git a/android/core/core/src/main/java/org/coepi/core/services/SymptomInputsManager.kt b/android/core/core/src/main/java/org/coepi/core/services/SymptomInputsManager.kt
@@ -77,7 +77,7 @@ class SymptomInputsManagerImpl(private val api: JniApi, private val gson: Gson)
         }.asResult()
 
     override fun setCoughStatus(input: UserInput<Cough.Status>): Result<Unit, Throwable> =
-        api.setCoughType(
+        api.setCoughStatus(
             input.toJniStringInput {
                 when (it) {
                     BETTER_AND_WORSE_THROUGH_DAY -> "better_and_worse"
@@ -113,7 +113,7 @@ class SymptomInputsManagerImpl(private val api: JniApi, private val gson: Gson)
         }
 
     override fun setFeverTakenTemperatureSpot(input: UserInput<Fever.TemperatureSpot>): Result<Unit, Throwable> =
-        api.setCoughType(
+        api.setFeverTakenTemperatureSpot(
             input.toJniStringInput {
                 when (it) {
                     is Armpit -> "armpit"

diff --git a/src/reporting/symptom_inputs_manager.rs b/src/reporting/symptom_inputs_manager.rs
@@ -93,7 +93,10 @@ where
             "none" => UserInput::None,
             "wet" => UserInput::Some(CoughType::Wet),
             "dry" => UserInput::Some(CoughType::Dry),
-            _ => Err(format!("Not supported: {}", cough_type))?,
+            _ => {
+                error!("Not supported cough type: {}", cough_type);
+                Err(format!("Not supported cough type: {}", cough_type))?
+            }
         };
 
         debug!("Setting cough type: {:?}", input);
@@ -120,7 +123,10 @@ where
             "better_and_worse" => UserInput::Some(CoughStatus::BetterAndWorseThroughDay),
             "same_steadily_worse" => UserInput::Some(CoughStatus::SameOrSteadilyWorse),
             "worse_outside" => UserInput::Some(CoughStatus::WorseWhenOutside),
-            _ => Err(format!("Not supported: {}", status))?,
+            _ => {
+                error!("Not supported cough status: {}", status);
+                Err(format!("Not supported cough status: {}", status))?
+            }
         };
 
         debug!("Setting cough status: {:?}", input);
@@ -141,7 +147,10 @@ where
             }
             "ground_own_pace" => UserInput::Some(BreathlessnessCause::GroundOwnPace),
             "hurry_or_hill" => UserInput::Some(BreathlessnessCause::HurryOrHill),
-            _ => Err(format!("Not supported: {}", cause))?,
+            _ => {
+                error!("Not supported breathlessness cause: {}", cause);
+                Err(format!("Not supported breathlessness cause: {}", cause))?
+            }
         };
 
         debug!("Setting breathlessness cause: {:?}", input);
@@ -185,7 +194,10 @@ where
             "ear" => UserInput::Some(TemperatureSpot::Ear),
             "mouth" => UserInput::Some(TemperatureSpot::Mouth),
             "other" => UserInput::Some(TemperatureSpot::Other),
-            _ => Err(format!("Not supported: {}", spot))?,
+            _ => {
+                error!("Not supported temperature spot: {}", spot);
+                Err(format!("Not supported temperature spot: {}", spot))?
+            }
         };
 
         debug!("Setting fever temperature spot: {:?}", input);