fix: NPE on ProductEditNutritionFactsFragment.kt init

Closes #4073
openfoodfacts · Jun 25, 2021 · 78ac2b3 · 78ac2b3
1 parent 7293db1
commit 78ac2b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/...hub/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt b/...hub/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt
@@ -678,10 +678,10 @@ class ProductEditNutritionFactsFragment : ProductEditFragment() {
     }
 
     private val isDataPerServing: Boolean
-        get() = viewModel.isDataPerServing.value!!
+        get() = viewModel.dataFormat.value == R.id.per_serving
 
     private val isDataPer100g: Boolean
-        get() = viewModel.isDataPer100g.value!!
+        get() = viewModel.dataFormat.value == R.id.for100g_100ml
 
     private val referenceValueInGram: Float
         get() {

diff --git a/.../github/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionViewModel.kt b/.../github/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionViewModel.kt
@@ -2,7 +2,6 @@ package openfoodfacts.github.scrachx.openfood.features.product.edit.nutrition
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.map
 import dagger.hilt.android.lifecycle.HiltViewModel
 import openfoodfacts.github.scrachx.openfood.R
 import openfoodfacts.github.scrachx.openfood.models.Product
@@ -15,8 +14,6 @@ class ProductEditNutritionViewModel @Inject constructor() : ViewModel() {
 
     val noNutritionFactsChecked = MutableLiveData<Boolean>()
 
-    val dataFormat = MutableLiveData<Int>()
+    val dataFormat = MutableLiveData(R.id.for100g_100ml)
 
-    val isDataPerServing = dataFormat.map { it == R.id.per_serving }
-    val isDataPer100g = dataFormat.map { it == R.id.for100g_100ml }
 }
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/repositories/TaxonomiesManager.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/repositories/TaxonomiesManager.kt
@@ -6,6 +6,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.Single
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.rx2.await
+import kotlinx.coroutines.rx2.rxSingle
 import kotlinx.coroutines.withContext
 import openfoodfacts.github.scrachx.openfood.BuildConfig
 import openfoodfacts.github.scrachx.openfood.utils.Utils
@@ -30,7 +31,7 @@ class TaxonomiesManager @Inject constructor(
      * @return The timestamp of the last changes date of the taxonomy.json on the server
      * or [TAXONOMY_NO_INTERNET] if there is no connection to the server.
      */
-    private fun getLastModifiedDateFromServer(taxonomy: Taxonomy): Single<Long> = Single.fromCallable {
+    private fun getLastModifiedDateFromServer(taxonomy: Taxonomy): Single<Long> = rxSingle(Dispatchers.IO) {
         var lastModifiedDate: Long
         val taxoUrl = URL(BuildConfig.OFWEBSITE + taxonomy.jsonUrl)
         try {
@@ -43,7 +44,7 @@ class TaxonomiesManager @Inject constructor(
             lastModifiedDate = TAXONOMY_NO_INTERNET
         }
         Log.i(LOG_TAG, "Last modified date for taxonomy \"$taxonomy\" is $lastModifiedDate")
-        return@fromCallable lastModifiedDate
+        return@rxSingle lastModifiedDate
     }
 
     /**

diff --git a/app/src/main/res/layout/fragment_add_product_nutrition_facts.xml b/app/src/main/res/layout/fragment_add_product_nutrition_facts.xml
@@ -143,7 +143,6 @@
                         android:id="@+id/for100g_100ml"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:checked="true"
                         android:text="@string/for_100g_100ml" />
 
                     <RadioButton