From b1fa6ac9987846dd88989c3fd5f39ca20e7d08d7 Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechnoworld.mohit@gmail.com>
Date: Wed, 26 Mar 2025 21:48:13 +0530
Subject: [PATCH] Upgraded the com.googlecode.json-simple to version 1.1.1. *
 Upgraded the com.squareup.okhttp3:okhttp to version 4.12.0. * Fixed remaining
 deprecated  object.

---
 buildSrc/build.gradle.kts                                     | 4 ++--
 .../main/java/org/kiwix/kiwixmobile/core/utils/BookUtils.kt   | 4 +++-
 .../java/org/kiwix/kiwixmobile/core/utils/files/FileUtils.kt  | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index f23b2bfa9..5540684d1 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -23,8 +23,8 @@ dependencies {
     exclude(group = "com.google.guava", module = "guava")
   }
   implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8")
-  implementation("com.googlecode.json-simple:json-simple:1.1")
-  implementation("com.squareup.okhttp3:okhttp:4.10.0")
+  implementation("com.googlecode.json-simple:json-simple:1.1.1")
+  implementation("com.squareup.okhttp3:okhttp:4.12.0")
 
   implementation(gradleApi())
   implementation(localGroovy())
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 794e1017d..0813b99c6 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,13 +17,15 @@
  */
 package org.kiwix.kiwixmobile.core.utils
 
+import org.kiwix.kiwixmobile.core.compat.CompatHelper.Companion.convertToLocal
 import java.util.Locale
 
 /**
  * Created by mhutti1 on 19/04/17.
  */
 class BookUtils {
-  val localeMap = Locale.getISOLanguages().map(::Locale).associateBy { it.isO3Language }
+  val localeMap =
+    Locale.getISOLanguages().map { it.convertToLocal() }.associateBy { it.isO3Language }
 
   // Get the language from the language codes of the parsed xml stream
   @Suppress("MagicNumber")
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/files/FileUtils.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/files/FileUtils.kt
index e8f42ffdf..e87b454f3 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/files/FileUtils.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/files/FileUtils.kt
@@ -55,7 +55,6 @@ import java.io.File
 import java.io.FileInputStream
 import java.io.FileNotFoundException
 import java.io.IOException
-import androidx.core.net.toUri
 
 object FileUtils {
   private val fileOperationMutex = Mutex()