From ec8a0da784a81a2d0c223c2652ae4340f0abe025 Mon Sep 17 00:00:00 2001
From: VaiTon <eyadlorenzo@gmail.com>
Date: Sat, 7 Aug 2021 15:23:16 +0200
Subject: [PATCH] fix: NPE in WikidataAPIClient

Closes OPENFOODFACTS-ANDROID-41S
---
 .../additives/AdditiveFragmentHelper.kt       |   6 +-
 .../product/view/CategoryProductHelper.kt     |   2 +-
 .../attribute/ProductAttributeFragment.kt     | 223 ++++++++++--------
 .../ingredients/IngredientsProductFragment.kt |   2 +-
 .../view/summary/SummaryProductFragment.kt    |   2 +-
 .../openfood/network/WikiDataApiClient.kt     |   9 +-
 .../openfood/network/services/WikidataAPI.kt  |   4 +-
 .../openfood/utils/DeserializerHelper.kt      |  16 +-
 .../fragment_product_attribute_details.xml    | 187 ++++++++-------
 9 files changed, 236 insertions(+), 215 deletions(-)

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/additives/AdditiveFragmentHelper.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/additives/AdditiveFragmentHelper.kt
index 7938442206ba..528b42121317 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/additives/AdditiveFragmentHelper.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/additives/AdditiveFragmentHelper.kt
@@ -58,12 +58,12 @@ object AdditiveFragmentHelper {
      * Returns additive tag from additive name using WikidataApiClient
      *
      * @param additive name of the additive
-     * @param apiClientForWikiData object of WikidataApiClient
+     * @param wikidataClient object of WikidataApiClient
      * @param fragment holds a reference to the calling fragment
      */
     private fun getAdditiveTag(
         additive: AdditiveName,
-        apiClientForWikiData: WikiDataApiClient,
+        wikidataClient: WikiDataApiClient,
         fragment: BaseFragment,
         lifecycleOwner: LifecycleOwner
     ): CharSequence {
@@ -72,7 +72,7 @@ object AdditiveFragmentHelper {
             override fun onClick(view: View) {
                 if (additive.isWikiDataIdPresent) {
                     lifecycleOwner.lifecycleScope.launch {
-                        val result = apiClientForWikiData.doSomeThing(additive.wikiDataId)
+                        val result = wikidataClient.getEntityData(additive.wikiDataId)
                         getOnWikiResponse(activity, additive)(result)
                     }
                 } else {
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
index 07f3e691f9df..4cc2b1e55238 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/CategoryProductHelper.kt
@@ -63,7 +63,7 @@ object CategoryProductHelper {
             override fun onClick(view: View) {
                 if (category.isWikiDataIdPresent == true) {
                     fragment.lifecycleScope.launch {
-                        val result = category.wikiDataId?.let { apiClient.doSomeThing(it) }
+                        val result = category.wikiDataId?.let { apiClient.getEntityData(it) }
                         if (result != null) {
                             val activity = fragment.activity
                             if (activity != null && !activity.isFinishing) {
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/attribute/ProductAttributeFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/attribute/ProductAttributeFragment.kt
index 6779c8e5967a..eb1eec451c45 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/attribute/ProductAttributeFragment.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/attribute/ProductAttributeFragment.kt
@@ -1,16 +1,14 @@
 package openfoodfacts.github.scrachx.openfood.features.product.view.attribute
 
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.widget.AppCompatImageView
-import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.net.toUri
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -20,7 +18,8 @@ import openfoodfacts.github.scrachx.openfood.R
 import openfoodfacts.github.scrachx.openfood.customtabs.CustomTabActivityHelper
 import openfoodfacts.github.scrachx.openfood.customtabs.CustomTabsHelper
 import openfoodfacts.github.scrachx.openfood.customtabs.WebViewFallback
-import openfoodfacts.github.scrachx.openfood.features.search.ProductSearchActivity.Companion.start
+import openfoodfacts.github.scrachx.openfood.databinding.FragmentProductAttributeDetailsBinding
+import openfoodfacts.github.scrachx.openfood.features.search.ProductSearchActivity
 import openfoodfacts.github.scrachx.openfood.models.DaoSession
 import openfoodfacts.github.scrachx.openfood.models.entities.additive.AdditiveName
 import openfoodfacts.github.scrachx.openfood.models.entities.additive.AdditiveNameDao
@@ -30,20 +29,26 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ProductAttributeFragment : BottomSheetDialogFragment() {
-    private var bottomSheetTitleIcon: AppCompatImageView? = null
-    private var mpInfantsImage: AppCompatImageView? = null
-    private var mpToddlersImage: AppCompatImageView? = null
-    private var mpChildrenImage: AppCompatImageView? = null
-    private var mpAdolescentsImage: AppCompatImageView? = null
-    private var mpAdultsImage: AppCompatImageView? = null
-    private var mpElderlyImage: AppCompatImageView? = null
-    private var spInfantsImage: AppCompatImageView? = null
-    private var spToddlersImage: AppCompatImageView? = null
-    private var spChildrenImage: AppCompatImageView? = null
-    private var spAdolescentsImage: AppCompatImageView? = null
-    private var spAdultsImage: AppCompatImageView? = null
-    private var spElderlyImage: AppCompatImageView? = null
-    private var customTabsIntent: CustomTabsIntent? = null
+    private lateinit var mpInfantsImage: AppCompatImageView
+    private lateinit var mpToddlersImage: AppCompatImageView
+    private lateinit var mpChildrenImage: AppCompatImageView
+    private lateinit var mpAdolescentsImage: AppCompatImageView
+    private lateinit var mpAdultsImage: AppCompatImageView
+    private lateinit var mpElderlyImage: AppCompatImageView
+    private lateinit var spInfantsImage: AppCompatImageView
+    private lateinit var spToddlersImage: AppCompatImageView
+    private lateinit var spChildrenImage: AppCompatImageView
+    private lateinit var spAdolescentsImage: AppCompatImageView
+    private lateinit var spAdultsImage: AppCompatImageView
+    private lateinit var spElderlyImage: AppCompatImageView
+    private val customTabsIntent by lazy {
+        CustomTabsHelper.getCustomTabsIntent(requireContext(), CustomTabActivityHelper().session)
+    }
+
+    private var _binding: FragmentProductAttributeDetailsBinding? = null
+    private val binding get() = _binding!!
+
+    private val mapper by lazy { jacksonObjectMapper() }
 
     @Inject
     lateinit var daoSession: DaoSession
@@ -52,55 +57,67 @@ class ProductAttributeFragment : BottomSheetDialogFragment() {
     lateinit var localeManager: LocaleManager
 
     override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
-    ): View = inflater.inflate(R.layout.fragment_product_attribute_details, container, false)
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentProductAttributeDetailsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val customTabActivityHelper = CustomTabActivityHelper()
-        customTabsIntent = CustomTabsHelper.getCustomTabsIntent(requireContext(), customTabActivityHelper.session)
-        val bottomSheetDescription = view.findViewById<TextView>(R.id.description)
-        val bottomSheetTitle = view.findViewById<TextView>(R.id.titleBottomSheet)
-        bottomSheetTitleIcon = view.findViewById(R.id.titleBottomSheetIcon)
-        val buttonToBrowseProducts = view.findViewById<Button>(R.id.buttonToBrowseProducts)
-        val wikipediaButton = view.findViewById<Button>(R.id.wikipediaButton)
+        mpInfantsImage = view.findViewById(R.id.mpInfants)
+        mpToddlersImage = view.findViewById(R.id.mpToddlers)
+        mpChildrenImage = view.findViewById(R.id.mpChildren)
+        mpAdolescentsImage = view.findViewById(R.id.mpAdolescents)
+        mpAdultsImage = view.findViewById(R.id.mpAdults)
+        mpElderlyImage = view.findViewById(R.id.mpElderly)
+        spInfantsImage = view.findViewById(R.id.spInfants)
+        spToddlersImage = view.findViewById(R.id.spToddlers)
+        spChildrenImage = view.findViewById(R.id.spChildren)
+        spAdolescentsImage = view.findViewById(R.id.spAdolescents)
+        spAdultsImage = view.findViewById(R.id.spAdults)
+        spElderlyImage = view.findViewById(R.id.spElderly)
+
         try {
-            val descriptionString: String?
-            val wikiLink: String?
             val arguments = requireArguments()
-            val result = jacksonObjectMapper().readTree(arguments.getString(ARG_OBJECT))
-
-            val description = result?.get("descriptions")
-            descriptionString = description?.let { getDescription(it) } ?: ""
+            val result = arguments.getString(ARG_OBJECT)?.let { mapper.readTree(it) }
 
-            val siteLinks = result?.get("sitelinks")
-            wikiLink = siteLinks?.let { getWikiLink(it) } ?: ""
+            binding.titleBottomSheet.text = arguments.getString(ARG_TITLE) ?: ""
 
-            val title = arguments.getString(ARG_TITLE) as String
-            bottomSheetTitle.text = title
+            val descriptionsNode = result?.get("descriptions")
+            val description = descriptionsNode?.let { getDescription(it) } ?: ""
 
-            if (descriptionString.isNotEmpty()) {
-                bottomSheetDescription.text = descriptionString
-                bottomSheetDescription.visibility = View.VISIBLE
+            if (description.isNotEmpty()) {
+                binding.description.text = description
+                binding.description.visibility = View.VISIBLE
             } else {
-                bottomSheetDescription.visibility = View.GONE
+                binding.description.visibility = View.GONE
             }
 
+            val siteLinks = result?.get("sitelinks")
+            val wikiLink = siteLinks?.let { getWikiLink(it) } ?: ""
+
             if (wikiLink.isNotEmpty()) {
-                wikipediaButton.setOnClickListener { openInCustomTab(wikiLink) }
-                wikipediaButton.visibility = View.VISIBLE
+                binding.wikipediaButton.setOnClickListener { openInCustomTab(wikiLink) }
+                binding.wikipediaButton.visibility = View.VISIBLE
             } else {
-                wikipediaButton.visibility = View.GONE
+                binding.wikipediaButton.visibility = View.GONE
             }
 
             val searchType = arguments.getSerializable(ARG_SEARCH_TYPE) as SearchType
-            buttonToBrowseProducts.setOnClickListener { start(requireContext(), searchType, title) }
+            binding.buttonToBrowseProducts.setOnClickListener {
+                ProductSearchActivity.start(
+                    requireContext(),
+                    searchType,
+                    arguments.getString(ARG_TITLE) ?: ""
+                )
+            }
             val id = arguments.getLong(ARG_ID)
             if (searchType == SearchType.ADDITIVE) {
                 daoSession.additiveNameDao.queryBuilder()
-                        .where(AdditiveNameDao.Properties.Id.eq(id)).unique()
-                        ?.let { updateContent(view, it) }
+                    .where(AdditiveNameDao.Properties.Id.eq(id)).unique()
+                    ?.let { updateContent(view, it) }
 
             }
         } catch (e: JsonProcessingException) {
@@ -109,30 +126,23 @@ class ProductAttributeFragment : BottomSheetDialogFragment() {
     }
 
     private fun updateContent(view: View, additive: AdditiveName) {
-        mpInfantsImage = view.findViewById(R.id.mpInfants)
-        mpToddlersImage = view.findViewById(R.id.mpToddlers)
-        mpChildrenImage = view.findViewById(R.id.mpChildren)
-        mpAdolescentsImage = view.findViewById(R.id.mpAdolescents)
-        mpAdultsImage = view.findViewById(R.id.mpAdults)
-        mpElderlyImage = view.findViewById(R.id.mpElderly)
-        spInfantsImage = view.findViewById(R.id.spInfants)
-        spToddlersImage = view.findViewById(R.id.spToddlers)
-        spChildrenImage = view.findViewById(R.id.spChildren)
-        spAdolescentsImage = view.findViewById(R.id.spAdolescents)
-        spAdultsImage = view.findViewById(R.id.spAdults)
-        spElderlyImage = view.findViewById(R.id.spElderly)
+
+
         if (!additive.hasOverexposureData()) return
-        val exposureEvalTable = view.findViewById<View>(R.id.exposureEvalTable)
+
+        val exposureEvalTable = binding.exposureEvalTable
         val efsaWarning = view.findViewById<TextView>(R.id.efsaWarning)
+
         val overexposureRisk = additive.overexposureRisk
-        val isHighRisk = "high".equals(overexposureRisk, ignoreCase = true)
+
+        val isHighRisk = "high".equals(overexposureRisk, true)
         if (isHighRisk) {
-            bottomSheetTitleIcon!!.setImageResource(R.drawable.ic_additive_high_risk)
+            binding.titleBottomSheetIcon.setImageResource(R.drawable.ic_additive_high_risk)
         } else {
-            bottomSheetTitleIcon!!.setImageResource(R.drawable.ic_additive_moderate_risk)
+            binding.titleBottomSheetIcon.setImageResource(R.drawable.ic_additive_moderate_risk)
         }
         efsaWarning.text = getString(R.string.efsa_warning_high_risk, additive.name)
-        bottomSheetTitleIcon!!.visibility = View.VISIBLE
+        binding.titleBottomSheetIcon.visibility = View.VISIBLE
 
         // noel will override adi evaluation if present
         updateAdditiveExposureTable(0, additive.exposureMeanGreaterThanAdi, R.drawable.yellow_circle)
@@ -144,45 +154,46 @@ class ProductAttributeFragment : BottomSheetDialogFragment() {
 
     private fun updateAdditiveExposureTable(row: Int, exposure: String?, drawableResId: Int) {
         if (exposure == null) return
+
         when (row) {
             0 -> {
-                if (exposure.contains("infants")) {
-                    mpInfantsImage!!.setImageResource(drawableResId)
+                if ("infants" in exposure) {
+                    mpInfantsImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("toddlers")) {
-                    mpToddlersImage!!.setImageResource(drawableResId)
+                if ("toddlers" in exposure) {
+                    mpToddlersImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("children")) {
-                    mpChildrenImage!!.setImageResource(drawableResId)
+                if ("children" in exposure) {
+                    mpChildrenImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("adolescents")) {
-                    mpAdolescentsImage!!.setImageResource(drawableResId)
+                if ("adolescents" in exposure) {
+                    mpAdolescentsImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("adults")) {
-                    mpAdultsImage!!.setImageResource(drawableResId)
+                if ("adults" in exposure) {
+                    mpAdultsImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("elderly")) {
-                    mpElderlyImage!!.setImageResource(drawableResId)
+                if ("elderly" in exposure) {
+                    mpElderlyImage.setImageResource(drawableResId)
                 }
             }
             1 -> {
-                if (exposure.contains("infants")) {
-                    spInfantsImage!!.setImageResource(drawableResId)
+                if ("infants" in exposure) {
+                    spInfantsImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("toddlers")) {
-                    spToddlersImage!!.setImageResource(drawableResId)
+                if ("toddlers" in exposure) {
+                    spToddlersImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("children")) {
-                    spChildrenImage!!.setImageResource(drawableResId)
+                if ("children" in exposure) {
+                    spChildrenImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("adolescents")) {
-                    spAdolescentsImage!!.setImageResource(drawableResId)
+                if ("adolescents" in exposure) {
+                    spAdolescentsImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("adults")) {
-                    spAdultsImage!!.setImageResource(drawableResId)
+                if ("adults" in exposure) {
+                    spAdultsImage.setImageResource(drawableResId)
                 }
-                if (exposure.contains("elderly")) {
-                    spElderlyImage!!.setImageResource(drawableResId)
+                if ("elderly" in exposure) {
+                    spElderlyImage.setImageResource(drawableResId)
                 }
             }
         }
@@ -192,16 +203,16 @@ class ProductAttributeFragment : BottomSheetDialogFragment() {
         var descriptionString: String? = null
 
         val languageCode = localeManager.getLanguage()
-        if (map[languageCode] != null) {
+        if (map.has(languageCode)) {
             descriptionString = map[languageCode]["value"].asText()
         }
 
-        if (descriptionString.isNullOrEmpty() && map["en"] != null) {
+        if (descriptionString.isNullOrEmpty() && map.has("en")) {
             descriptionString = map["en"]["value"].asText()
         }
 
         if (descriptionString.isNullOrEmpty()) {
-            Log.i(LOG_TAG, "Result for description is not found in native or english language.")
+            Log.w(LOG_TAG, "Result for description is not found in native or english language.")
         }
         return descriptionString
     }
@@ -209,8 +220,8 @@ class ProductAttributeFragment : BottomSheetDialogFragment() {
     private fun getWikiLink(map: JsonNode): String? {
         val languageCode = "${localeManager.getLanguage()}wiki"
         return when {
-            map[languageCode] != null -> map[languageCode]["url"].asText()
-            map["enwiki"] != null -> map["enwiki"]["url"].asText()
+            map.has(languageCode) -> map[languageCode]["url"].asText()
+            map.has("enwiki") -> map["enwiki"]["url"].asText()
             else -> {
                 Log.i(LOG_TAG, "Result for wikilink is not found in native or english language.")
                 null
@@ -220,12 +231,17 @@ class ProductAttributeFragment : BottomSheetDialogFragment() {
 
     private fun openInCustomTab(url: String) {
         // Url might be empty string if there is no wiki link in english or the user's language
-        if (url != "") {
-            val wikipediaUri = Uri.parse(url)
-            CustomTabActivityHelper.openCustomTab(requireActivity(), customTabsIntent!!, wikipediaUri, WebViewFallback())
-        } else {
+        if (url.isEmpty()) {
             Toast.makeText(context, R.string.wikidata_unavailable, Toast.LENGTH_SHORT).show()
+            return
         }
+        val uri = url.toUri()
+        CustomTabActivityHelper.openCustomTab(
+            requireActivity(),
+            customTabsIntent,
+            uri,
+            WebViewFallback()
+        )
     }
 
     companion object {
@@ -234,11 +250,12 @@ class ProductAttributeFragment : BottomSheetDialogFragment() {
         private const val ARG_ID = "code"
         private const val ARG_SEARCH_TYPE = "search_type"
         private const val ARG_TITLE = "title"
+
         fun newInstance(
-                jsonObjectStr: JsonNode?,
-                id: Long,
-                searchType: SearchType?,
-                title: String?
+            jsonObjectStr: JsonNode?,
+            id: Long,
+            searchType: SearchType?,
+            title: String?
         ) = ProductAttributeFragment().apply {
             arguments = Bundle().apply {
                 putString(ARG_OBJECT, jsonObjectStr.toString())
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt
index 331125a5f7bc..91b4cb8819a4 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/ingredients/IngredientsProductFragment.kt
@@ -327,7 +327,7 @@ class IngredientsProductFragment : BaseFragment() {
             override fun onClick(view: View) {
                 if (allergen.isWikiDataIdPresent) {
                     lifecycleScope.launch {
-                        val result = wikidataClient.doSomeThing(
+                        val result = wikidataClient.getEntityData(
                             allergen.wikiDataId
                         )
                         val activity = activity
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
index e15abc5d28f7..573eeeef03a0 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
@@ -762,7 +762,7 @@ class SummaryProductFragment : BaseFragment(), ISummaryProductPresenter.View {
             override fun onClick(view: View) {
                 if (label.isWikiDataIdPresent) {
                     lifecycleScope.launch {
-                        val result = wikidataClient.doSomeThing(label.wikiDataId)
+                        val result = wikidataClient.getEntityData(label.wikiDataId)
                         val activity = activity
                         if (activity?.isFinishing == false) {
                             showBottomSheet(result, label, activity.supportFragmentManager)
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/WikiDataApiClient.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/WikiDataApiClient.kt
index 8cd614466713..b7cf8a35ce2a 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/WikiDataApiClient.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/WikiDataApiClient.kt
@@ -13,12 +13,15 @@ import javax.inject.Singleton
  */
 @Singleton
 class WikiDataApiClient @Inject constructor(
-        private val wikidataAPI: WikidataAPI
+    private val wikidataAPI: WikidataAPI
 ) {
     /**
      * Get json response of the WikiData for additive/ingredient/category/label using their WikiDataID
      *
-     * @param code WikiData ID of additive/ingredient/category/label
+     * @param entityId WikiData ID of additive/ingredient/category/label
      */
-    suspend fun doSomeThing(code: String): JsonNode = wikidataAPI.getWikiCategory(code)["entities"][code]
+    suspend fun getEntityData(entityId: String): JsonNode {
+        require(entityId[0] == 'Q') { "Entity ID should start with 'Q'. Got: $entityId" }
+        return wikidataAPI.getEntity(entityId)["entities"][entityId]
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/services/WikidataAPI.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/services/WikidataAPI.kt
index 83b20b8a16e9..a4b6ea2e3ac7 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/services/WikidataAPI.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/services/WikidataAPI.kt
@@ -9,6 +9,6 @@ import retrofit2.http.Path
  * Get method to get json response from wikidata server.
  */
 interface WikidataAPI {
-    @GET("{code}.json")
-    suspend fun getWikiCategory(@Path("code") code: String): ObjectNode
+    @GET("{id}.json")
+    suspend fun getEntity(@Path("id") entityId: String): ObjectNode
 }
\ No newline at end of file
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/DeserializerHelper.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/DeserializerHelper.kt
index 5c76fd900453..296c643907b9 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/DeserializerHelper.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/DeserializerHelper.kt
@@ -1,6 +1,5 @@
 package openfoodfacts.github.scrachx.openfood.utils
 
-import android.util.Log
 import com.fasterxml.jackson.databind.JsonNode
 
 object DeserializerHelper {
@@ -21,11 +20,10 @@ object DeserializerHelper {
      *
      * @param namesNode namesNode in Json response
      */
-    fun extractMapFromJsonNode(namesNode: JsonNode): Map<String, String> {
-        val names = hashMapOf<String, String>()
-        namesNode.fields().forEach { names[it.key] = it.value.asText() }
-        return names
-    }
+    fun extractMapFromJsonNode(namesNode: JsonNode) = namesNode.fields()
+        .asSequence()
+        .map { it.key to it.value.asText() }
+        .toMap()
 
     /**
      * Extracts child nodes from a map of subnodes
@@ -34,10 +32,6 @@ object DeserializerHelper {
      * @param key get the JsonNode for the given key
      */
     fun extractChildNodeAsText(subNode: Map.Entry<String?, JsonNode>, key: String?) =
-            subNode.value[key]?.toList()?.map {
-                if (Log.isLoggable(LOG_TAG, Log.INFO)) Log.i(LOG_TAG, "ExtractChildNodeAsText, ajout de ${it.asText()}")
-                it.asText()
-            } ?: listOf()
+        subNode.value[key]?.toList()?.map { it.asText() } ?: listOf()
 
-    private val LOG_TAG = DeserializerHelper::class.simpleName!!
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_product_attribute_details.xml b/app/src/main/res/layout/fragment_product_attribute_details.xml
index d36d24046b35..9ce83b4c6485 100644
--- a/app/src/main/res/layout/fragment_product_attribute_details.xml
+++ b/app/src/main/res/layout/fragment_product_attribute_details.xml
@@ -1,111 +1,118 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <LinearLayout
+    <data>
+
+    </data>
+
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <TextView
-            style="@style/ButtonFlat.Green"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:contentDescription="@string/app_name"
-            android:gravity="center"
-            android:padding="@dimen/padding_short"
-            android:scaleType="center"
-            android:text="@string/wikidata_information"
-            android:textAlignment="center"
-            android:textSize="@dimen/font_large" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/ButtonFlat.Green"
+                android:layout_width="match_parent"
+                android:contentDescription="@string/app_name"
+                android:gravity="center"
+                android:padding="@dimen/padding_short"
+                android:scaleType="center"
+                android:text="@string/wikidata_information"
+                android:textAlignment="center"
+                android:textSize="@dimen/font_large" />
 
-            <LinearLayout
-                android:id="@+id/titleContainer"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/spacing_tiny"
-                android:background="@color/grey_50"
-                android:gravity="center_vertical|center_horizontal"
-                android:orientation="horizontal"
-                android:padding="@dimen/spacing_small">
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:id="@+id/titleContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/spacing_tiny"
+                    android:background="@color/grey_50"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/spacing_small">
+
+                    <TextView
+                        android:id="@+id/titleBottomSheet"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/title_activity_product"
+                        android:textAlignment="center"
+                        android:textSize="@dimen/font_large"
+                        android:textStyle="bold" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/titleBottomSheetIcon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
+
 
                 <TextView
-                    android:id="@+id/titleBottomSheet"
-                    android:layout_width="0dp"
+                    android:id="@+id/description"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
+                    android:layout_below="@+id/titleContainer"
+                    android:layout_margin="@dimen/spacing_tiny"
+                    android:background="@color/grey_50"
                     android:gravity="center"
-                    android:text="@string/title_activity_product"
+                    android:padding="@dimen/spacing_small"
+                    android:text="@string/description_activity_product"
                     android:textAlignment="center"
-                    android:textSize="@dimen/font_large"
-                    android:textStyle="bold"/>
+                    android:textSize="@dimen/font_normal" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/titleBottomSheetIcon"
-                    android:layout_width="wrap_content"
+                <include
+                    android:id="@+id/exposureEvalTable"
+                    layout="@layout/exposure_eval_table"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_below="@+id/description"
                     android:visibility="gone" />
-            </LinearLayout>
-
 
-            <TextView
-                android:id="@+id/description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/titleContainer"
-                android:layout_margin="@dimen/spacing_tiny"
-                android:background="@color/grey_50"
-                android:gravity="center"
-                android:padding="@dimen/spacing_small"
-                android:text="@string/description_activity_product"
-                android:textAlignment="center"
-                android:textSize="@dimen/font_normal"/>
-
-            <include
-                android:id="@+id/exposureEvalTable"
-                layout="@layout/exposure_eval_table"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/description"
-                android:visibility="gone"/>
-
-            <LinearLayout
-                android:id="@+id/buttonsContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/exposureEvalTable"
-                android:layout_marginBottom="@dimen/spacing_small"
-                android:gravity="center"
-                android:weightSum="100">
-
-                <Button
-                    android:id="@+id/wikipediaButton"
-                    style="@style/ButtonFlat"
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:id="@+id/buttonsContainer"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/spacing_normal"
-                    android:layout_weight="50"
-                    android:text="@string/Wikipedia"
-                    android:textStyle="normal" />
+                    android:layout_below="@id/exposureEvalTable"
+                    android:layout_marginBottom="@dimen/spacing_small"
+                    android:gravity="center"
+                    android:weightSum="100">
 
+                    <Button
+                        android:id="@+id/wikipediaButton"
+                        style="@style/ButtonFlat"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/spacing_normal"
+                        android:layout_weight="50"
+                        android:text="@string/Wikipedia"
+                        android:textStyle="normal" />
 
-                <Button
-                    android:id="@+id/buttonToBrowseProducts"
-                    style="@style/ButtonFlat"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/spacing_normal"
-                    android:layout_weight="50"
-                    android:text="@string/Browse_Products"
-                    android:textStyle="normal" />
-            </LinearLayout>
-        </RelativeLayout>
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+
+                    <Button
+                        android:id="@+id/buttonToBrowseProducts"
+                        style="@style/ButtonFlat"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/spacing_normal"
+                        android:layout_weight="50"
+                        android:text="@string/Browse_Products"
+                        android:textStyle="normal" />
+                </LinearLayout>
+            </RelativeLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</layout>