From 41b7abf5656cc9d2873ce595bc2016b03cb5d986 Mon Sep 17 00:00:00 2001
From: Hritik Wadhwa <akkywadhwa@gmail.com>
Date: Fri, 20 Mar 2020 03:27:28 +0530
Subject: [PATCH] Fixing BookUtil error

---
 .../kiwix/kiwixmobile/core/extensions/BookExtensions.kt  | 2 +-
 .../java/org/kiwix/kiwixmobile/core/utils/BookUtils.kt   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/BookExtensions.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/BookExtensions.kt
index 3ec287a37..45ae77a10 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/BookExtensions.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/extensions/BookExtensions.kt
@@ -45,7 +45,7 @@ fun Book.buildSearchableText(bookUtils: BookUtils): String =
     append(NetworkUtils.parseURL(CoreApp.getInstance(), url))
     append("|")
     if (bookUtils.localeMap.containsKey(language)) {
-      append(bookUtils.localeMap[language]!!.displayLanguage)
+      append(bookUtils.localeMap[language]?.displayLanguage)
       append("|")
     }
   }.toString()
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/BookUtils.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/BookUtils.kt
index 652e688f1..e0b7d43d3 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/BookUtils.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/BookUtils.kt
@@ -17,25 +17,24 @@
  */
 package org.kiwix.kiwixmobile.core.utils
 
-import java.util.HashMap
 import java.util.Locale
 
 /**
  * Created by mhutti1 on 19/04/17.
  */
 class BookUtils {
-  val localeMap = Locale.getISOLanguages().associateBy { Locale(it).isO3Language; Locale(it) }
+  val localeMap = Locale.getISOLanguages().associateBy({ Locale(it).isO3Language }, ::Locale)
 
   // Get the language from the language codes of the parsed xml stream
   @Suppress("MagicNumber")
-  fun getLanguage(languageCode: String?): String {
+  fun getLanguage(languageCode: String): String? {
     return when {
       languageCode == null -> ""
       languageCode.length == 2 -> {
         LanguageContainer(languageCode).languageName
       }
       languageCode.length == 3 -> {
-        localeMap.filter { it.value == languageCode }.keys.first().displayLanguage
+        localeMap[languageCode]?.displayLanguage
       }
       else -> {
         ""
@@ -43,4 +42,4 @@ class BookUtils {
     }
   }
 }
-}
+