fix: NPE in ProductListAdapter (#4469)

openfoodfacts · Feb 8, 2022 · 3af2973 · 3af2973
1 parent 70d4e09
commit 3af2973
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...ain/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListAdapter.kt b/...ain/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListAdapter.kt
@@ -37,7 +37,7 @@ class ProductListAdapter(
         holder.tvDetails.text = products[position].productDetails
         holder.tvBarcode.text = products[position].barcode
 
-        if (!isLowBatteryMode && products[position].imageUrl.isNotEmpty()) {
+        if (!isLowBatteryMode && !products[position].imageUrl.isNullOrEmpty()) {
             picasso
                 .load(products[position].imageUrl)
                 .placeholder(R.drawable.placeholder_thumb)

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/entities/ListedProduct.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/entities/ListedProduct.java
@@ -6,6 +6,8 @@
 import org.greenrobot.greendao.annotation.Index;
 import org.greenrobot.greendao.annotation.Property;
 
+import javax.annotation.Nullable;
+
 @Entity(
     nameInDb = "YOUR_LISTED_PRODUCT",
     indexes = {@Index(value = "listId, barcode", unique = true)}
@@ -82,6 +84,7 @@ public void setProductDetails(String productDetails) {
         this.productDetails = productDetails;
     }
 
+    @Nullable
     public String getImageUrl() {
         return this.imageUrl;
     }