diff --git a/app/app-release.apk b/app/app-release.apk index 480305eb7348..f0ee5db6dffc 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/IngredientsProductFragment.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/IngredientsProductFragment.java index f787226d3e72..ce99e973a56a 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/IngredientsProductFragment.java +++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/IngredientsProductFragment.java @@ -47,13 +47,16 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { Intent intent = getActivity().getIntent(); mState = (State) intent.getExtras().getSerializable("state"); - SpannableStringBuilder txtIngredients = new SpannableStringBuilder(Html.fromHtml(mState.getProduct().getIngredientsText().replace("_",""))); - txtIngredients = setSpanBoldBetweenTokens(txtIngredients); - if(!txtIngredients.toString().substring(txtIngredients.toString().indexOf(":")).trim().isEmpty()) { - ingredientsProduct.setText(txtIngredients); - } else { - ingredientsProduct.setVisibility(View.GONE); + if(mState.getProduct().getIngredientsText() != null) { + SpannableStringBuilder txtIngredients = new SpannableStringBuilder(Html.fromHtml(mState.getProduct().getIngredientsText().replace("_",""))); + txtIngredients = setSpanBoldBetweenTokens(txtIngredients); + if(!txtIngredients.toString().substring(txtIngredients.toString().indexOf(":")).trim().isEmpty()) { + ingredientsProduct.setText(txtIngredients); + } else { + ingredientsProduct.setVisibility(View.GONE); + } } + if(!cleanAllergensString().trim().isEmpty()) { substanceProduct.setText(Html.fromHtml("" + getString(R.string.txtSubstances) + "" + ' ' + cleanAllergensString())); } else {