From 7c2320722581ce0462e26e5568654570194f9ac9 Mon Sep 17 00:00:00 2001
From: MohitMali <futuretechnoworld.mohit@gmail.com>
Date: Tue, 5 Sep 2023 19:03:53 +0530
Subject: [PATCH] Fixed detekt errors

---
 .../org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt   | 4 +++-
 .../java/org/kiwix/kiwixmobile/core/data/DataSource.kt    | 1 -
 .../org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt | 8 +++-----
 .../core/page/bookmark/viewmodel/BookmarkState.kt         | 4 ++--
 .../viewmodel/effects/ShowDeleteBookmarksDialog.kt        | 1 -
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt
index e8f731b82..f3b8e68d5 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt
@@ -40,7 +40,9 @@ class LibkiwixBookmarks @Inject constructor(
 ) : PageDao {
 
   private val bookmarksFolderPath: String by lazy {
-    sharedPreferenceUtil.getPublicDirectoryPath(sharedPreferenceUtil.defaultStorage()) + "/kiwix/Bookmarks/"
+    sharedPreferenceUtil.getPublicDirectoryPath(
+      sharedPreferenceUtil.defaultStorage()
+    ) + "/kiwix/Bookmarks/"
   }
 
   private val bookmarkFile: File by lazy {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/DataSource.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/DataSource.kt
index 159eab784..3ff5bfc57 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/DataSource.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/DataSource.kt
@@ -20,7 +20,6 @@ package org.kiwix.kiwixmobile.core.data
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Single
-import org.kiwix.kiwixmobile.core.page.bookmark.adapter.BookmarkItem
 import org.kiwix.kiwixmobile.core.page.bookmark.adapter.LibkiwixBookmarkItem
 import org.kiwix.kiwixmobile.core.page.history.adapter.HistoryListItem
 import org.kiwix.kiwixmobile.core.page.history.adapter.HistoryListItem.HistoryItem
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
index b7654f193..ec02a67de 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
@@ -342,7 +342,6 @@ abstract class CoreReaderFragment :
   private var navigationHistoryList: MutableList<NavigationHistoryListItem> = ArrayList()
   private var isReadSelection = false
   private var isReadAloudServiceRunning = false
-  private var libKiwixBook: Book? = null
 
   private var storagePermissionForNotesLauncher: ActivityResultLauncher<String>? =
     registerForActivityResult(
@@ -1114,7 +1113,6 @@ abstract class CoreReaderFragment :
     unRegisterReadAloudService()
     storagePermissionForNotesLauncher?.unregister()
     storagePermissionForNotesLauncher = null
-    libKiwixBook = null
   }
 
   private fun updateTableOfContents() {
@@ -1653,16 +1651,16 @@ abstract class CoreReaderFragment :
   fun toggleBookmark() {
     getCurrentWebView()?.url?.let { articleUrl ->
       zimReaderContainer?.zimFileReader?.let { zimFileReader ->
-        libKiwixBook = Book().apply {
+        val libKiwixBook = Book().apply {
           update(zimFileReader.jniKiwixReader)
         }
         if (isBookmarked) {
-          repositoryActions?.deleteBookmark(libKiwixBook!!.id, articleUrl)
+          repositoryActions?.deleteBookmark(libKiwixBook.id, articleUrl)
           snackBarRoot?.snack(R.string.bookmark_removed)
         } else {
           getCurrentWebView()?.title?.let {
             repositoryActions?.saveBookmark(
-              LibkiwixBookmarkItem(it, articleUrl, zimFileReader, libKiwixBook!!)
+              LibkiwixBookmarkItem(it, articleUrl, zimFileReader, libKiwixBook)
             )
             snackBarRoot?.snack(
               stringId = R.string.bookmark_added,
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/BookmarkState.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/BookmarkState.kt
index 0bf9f095e..aea012598 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/BookmarkState.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/BookmarkState.kt
@@ -30,6 +30,6 @@ data class BookmarkState(
 ) : PageState<LibkiwixBookmarkItem>() {
   override val visiblePageItems: List<PageRelated> = filteredPageItems
 
-  override fun copyWithNewItems(newItems: List<LibkiwixBookmarkItem>): PageState<LibkiwixBookmarkItem> =
-    copy(pageItems = newItems)
+  override fun copyWithNewItems(newItems: List<LibkiwixBookmarkItem>):
+    PageState<LibkiwixBookmarkItem> = copy(pageItems = newItems)
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt
index c8599ec9e..22ba4ad65 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt
@@ -23,7 +23,6 @@ import io.reactivex.processors.PublishProcessor
 import org.kiwix.kiwixmobile.core.base.SideEffect
 import org.kiwix.kiwixmobile.core.dao.PageDao
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.cachedComponent
-import org.kiwix.kiwixmobile.core.page.bookmark.adapter.BookmarkItem
 import org.kiwix.kiwixmobile.core.page.bookmark.adapter.LibkiwixBookmarkItem
 import org.kiwix.kiwixmobile.core.page.viewmodel.PageState
 import org.kiwix.kiwixmobile.core.page.viewmodel.effects.DeletePageItems