Refactored the unnecessary code.

kiwix · Feb 24, 2025 · 422e93c · 422e93c
1 parent 8527e20
commit 422e93c
Show file tree

Hide file tree

Showing 28 changed files with 590 additions and 631 deletions.
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferRobot.kt
@@ -42,8 +42,7 @@ import uk.co.deanwild.materialshowcaseview.R.id
  */
 
 fun localFileTransfer(func: LocalFileTransferRobot.() -> Unit) =
-  LocalFileTransferRobot()
-    .applyWithViewHierarchyPrinting(func)
+  LocalFileTransferRobot().applyWithViewHierarchyPrinting(func)
 
 class LocalFileTransferRobot : BaseRobot() {
   fun assertReceiveFileTitleVisible() {

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/widgets/SearchWidgetRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/widgets/SearchWidgetRobot.kt
@@ -41,8 +41,7 @@ import org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS_FOR_DOWNLOAD_TEST
 import org.kiwix.kiwixmobile.testutils.TestUtils.testFlakyView
 
 fun searchWidget(func: SearchWidgetRobot.() -> Unit) =
-  SearchWidgetRobot()
-    .applyWithViewHierarchyPrinting(func)
+  SearchWidgetRobot().applyWithViewHierarchyPrinting(func)
 
 class SearchWidgetRobot : BaseRobot() {
   fun removeWidgetIfAlreadyAdded(uiDevice: UiDevice) {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/intro/IntroPresenter.kt b/app/src/main/java/org/kiwix/kiwixmobile/intro/IntroPresenter.kt
@@ -23,9 +23,10 @@ import org.kiwix.kiwixmobile.intro.IntroContract.Presenter
 import org.kiwix.kiwixmobile.intro.IntroContract.View
 import javax.inject.Inject
 
-class IntroPresenter @Inject internal constructor(private val preferences: SharedPreferenceUtil) :
-  BasePresenter<View?>(), Presenter {
-    override fun setIntroShown() {
-      preferences.setIntroShown()
-    }
+class IntroPresenter @Inject internal constructor(
+  private val preferences: SharedPreferenceUtil
+) : BasePresenter<View?>(), Presenter {
+  override fun setIntroShown() {
+    preferences.setIntroShown()
   }
+}
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt
@@ -29,37 +29,38 @@ import org.kiwix.kiwixmobile.webserver.ZimHostContract.View
 import javax.inject.Inject
 
 @ActivityScope
-class ZimHostPresenter @Inject internal constructor(private val dataSource: DataSource) :
-  BasePresenter<View>(),
+class ZimHostPresenter @Inject internal constructor(
+  private val dataSource: DataSource
+) : BasePresenter<View>(),
   Presenter {
-    override fun loadBooks(previouslyHostedBooks: Set<String>) {
-      dataSource.getLanguageCategorizedBooks()
-        .map { books ->
-          books
-            .filterIsInstance<BooksOnDiskListItem.BookOnDisk>()
-            .forEach {
-              it.isSelected =
-                previouslyHostedBooks.contains(it.book.title) || previouslyHostedBooks.isEmpty()
-            }
-          books
-        }.subscribe(
-          object : SingleObserver<List<BooksOnDiskListItem>> {
-            override fun onSubscribe(d: Disposable) {
-              compositeDisposable.add(d)
-            }
+  override fun loadBooks(previouslyHostedBooks: Set<String>) {
+    dataSource.getLanguageCategorizedBooks()
+      .map { books ->
+        books
+          .filterIsInstance<BooksOnDiskListItem.BookOnDisk>()
+          .forEach {
+            it.isSelected =
+              previouslyHostedBooks.contains(it.book.title) || previouslyHostedBooks.isEmpty()
+          }
+        books
+      }.subscribe(
+        object : SingleObserver<List<BooksOnDiskListItem>> {
+          override fun onSubscribe(d: Disposable) {
+            compositeDisposable.add(d)
+          }
 
-            override fun onSuccess(books: List<BooksOnDiskListItem>) {
-              view?.addBooks(books)
-            }
+          override fun onSuccess(books: List<BooksOnDiskListItem>) {
+            view?.addBooks(books)
+          }
 
-            override fun onError(e: Throwable) {
-              Log.e(TAG, "Unable to load books", e)
-            }
+          override fun onError(e: Throwable) {
+            Log.e(TAG, "Unable to load books", e)
           }
-        )
-    }
+        }
+      )
+  }
 
-    companion object {
-      private const val TAG = "ZimHostPresenter"
-    }
+  companion object {
+    private const val TAG = "ZimHostPresenter"
   }
+}
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/wifi_hotspot/HotspotStateReceiver.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/wifi_hotspot/HotspotStateReceiver.kt
@@ -32,37 +32,38 @@ const val WIFI_AP_STATE_ENABLING = 12
 const val WIFI_AP_STATE_ENABLED = 13
 const val WIFI_AP_STATE_FAILED = 14
 
-class HotspotStateReceiver @Inject constructor(private val callback: Callback) :
-  BaseBroadcastReceiver() {
-    override val action: String = ACTION_WIFI_AP_STATE
+class HotspotStateReceiver @Inject constructor(
+  private val callback: Callback
+) : BaseBroadcastReceiver() {
+  override val action: String = ACTION_WIFI_AP_STATE
 
-    override fun onIntentWithActionReceived(context: Context, intent: Intent) {
-      if (DISABLED == hotspotState(intent)) {
-        callback.onHotspotDisabled()
-      }
+  override fun onIntentWithActionReceived(context: Context, intent: Intent) {
+    if (DISABLED == hotspotState(intent)) {
+      callback.onHotspotDisabled()
     }
+  }
 
-    private fun hotspotState(intent: Intent) =
-      HotspotState.from(
-        intent.getIntExtra(
-          EXTRA_WIFI_AP_STATE,
-          -1
-        )
+  private fun hotspotState(intent: Intent) =
+    HotspotState.from(
+      intent.getIntExtra(
+        EXTRA_WIFI_AP_STATE,
+        -1
       )
+    )
 
-    interface Callback {
-      fun onHotspotDisabled()
-    }
+  interface Callback {
+    fun onHotspotDisabled()
+  }
 
-    private enum class HotspotState(val state: Int) {
-      DISABLING(WIFI_AP_STATE_DISABLING),
-      DISABLED(WIFI_AP_STATE_DISABLED),
-      ENABLING(WIFI_AP_STATE_ENABLING),
-      ENABLED(WIFI_AP_STATE_ENABLED),
-      FAILED(WIFI_AP_STATE_FAILED);
+  private enum class HotspotState(val state: Int) {
+    DISABLING(WIFI_AP_STATE_DISABLING),
+    DISABLED(WIFI_AP_STATE_DISABLED),
+    ENABLING(WIFI_AP_STATE_ENABLING),
+    ENABLED(WIFI_AP_STATE_ENABLED),
+    FAILED(WIFI_AP_STATE_FAILED);
 
-      companion object {
-        fun from(state: Int) = HotspotState.values().firstOrNull { state == it.state }
-      }
+    companion object {
+      fun from(state: Int) = HotspotState.values().firstOrNull { state == it.state }
     }
   }
+}
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zimManager/MountFileSystemChecker.kt b/app/src/main/java/org/kiwix/kiwixmobile/zimManager/MountFileSystemChecker.kt
@@ -31,7 +31,10 @@ class MountFileSystemChecker @Inject constructor(
   override fun checkFilesystemSupports4GbFiles(path: String) =
     recursivelyDetermineFilesystem(mountPointProducer.produce(), path)
 
-  private fun recursivelyDetermineFilesystem(mountPoints: List<MountInfo>, path: String): FileSystemCapability =
+  private fun recursivelyDetermineFilesystem(
+    mountPoints: List<MountInfo>,
+    path: String
+  ): FileSystemCapability =
     mountPoints.maxBy { it.matchCount(path) }
       ?.takeIf { it.matchCount(path) > 0 }
       ?.let {

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zimManager/libraryView/adapter/LibraryAdapter.kt b/app/src/main/java/org/kiwix/kiwixmobile/zimManager/libraryView/adapter/LibraryAdapter.kt
@@ -23,8 +23,6 @@ import org.kiwix.kiwixmobile.core.base.adapter.BaseDelegateAdapter
 
 class LibraryAdapter(
   vararg delegates: AdapterDelegate<LibraryListItem>
-) : BaseDelegateAdapter<LibraryListItem>(
-    *delegates
-  ) {
+) : BaseDelegateAdapter<LibraryListItem>(*delegates) {
   override fun getIdFor(item: LibraryListItem) = item.id
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/base/adapter/AbsDelegateAdapter.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/base/adapter/AbsDelegateAdapter.kt
@@ -25,8 +25,7 @@ interface AbsDelegateAdapter<
   INSTANCE : SUPERTYPE,
   SUPERTYPE : Any,
   out VIEWHOLDER : BaseViewHolder<INSTANCE>
-  > :
-  AdapterDelegate<SUPERTYPE> {
+  > : AdapterDelegate<SUPERTYPE> {
   val itemClass: Class<INSTANCE>
 
   @Suppress("UNCHECKED_CAST")

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/compat/ResolveInfoFlagsCompat.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/compat/ResolveInfoFlagsCompat.kt
@@ -26,19 +26,18 @@ import android.os.UserManager
 
 class ResolveInfoFlagsCompat private constructor(
   @ResolveInfoFlagsBitsCompat value: Long
-) :
-  Flags(value) {
-    companion object {
-      fun of(
-        @ResolveInfoFlagsBitsCompat value: Long
-      ): ResolveInfoFlagsCompat =
-        ResolveInfoFlagsCompat(value)
+) : Flags(value) {
+  companion object {
+    fun of(
+      @ResolveInfoFlagsBitsCompat value: Long
+    ): ResolveInfoFlagsCompat =
+      ResolveInfoFlagsCompat(value)
 
-      /** Helper property. Does not exist on Platform API */
-      val EMPTY
-        get() = ResolveInfoFlagsCompat(0)
-    }
+    /** Helper property. Does not exist on Platform API */
+    val EMPTY
+      get() = ResolveInfoFlagsCompat(0)
   }
+}
 
 /**
  * [ComponentInfo] flag: return the [ComponentInfo.metaData]

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
@@ -34,40 +34,22 @@ import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDis
  */
 interface DataSource {
   fun getLanguageCategorizedBooks(): Single<List<BooksOnDiskListItem>>
-
   fun saveBook(book: BookOnDisk): Completable
-
   fun saveBooks(book: List<BookOnDisk>): Completable
-
   fun saveLanguages(languages: List<Language>): Completable
-
   fun saveHistory(history: HistoryItem): Completable
-
   fun deleteHistory(historyList: List<HistoryListItem>): Completable
-
   fun clearHistory(): Completable
-
   fun getBookmarks(): Flowable<List<LibkiwixBookmarkItem>>
-
   fun getCurrentZimBookmarksUrl(): io.reactivex.rxjava3.core.Single<List<String>>
-
   fun saveBookmark(libkiwixBookmarkItem: LibkiwixBookmarkItem): io.reactivex.rxjava3.core.Completable
-
   fun deleteBookmarks(bookmarks: List<LibkiwixBookmarkItem>): Completable
-
   fun deleteBookmark(bookId: String, bookmarkUrl: String): Completable?
-
   fun booksOnDiskAsListItems(): Flowable<List<BooksOnDiskListItem>>
-
   fun saveNote(noteListItem: NoteListItem): Completable
-
   fun deleteNote(noteTitle: String): Completable
-
   fun deleteNotes(noteList: List<NoteListItem>): Completable
-
   suspend fun insertWebViewPageHistoryItems(webViewHistoryEntityList: List<WebViewHistoryEntity>)
-
   fun getAllWebViewPagesHistory(): Single<List<WebViewHistoryEntity>>
-
   suspend fun clearWebViewPagesHistory()
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/KiwixService.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/KiwixService.kt
@@ -34,21 +34,21 @@ import retrofit2.http.Url
 interface KiwixService {
   @get:GET(LIBRARY_NETWORK_PATH) val library: Single<LibraryNetworkEntity?>
 
-  @GET fun getMetaLinks(
+  @GET
+  fun getMetaLinks(
     @Url url: String
   ): Observable<MetaLinkNetworkEntity?>
 
   /******** Helper class that sets up new services  */
   object ServiceCreator {
     @Suppress("DEPRECATION")
     fun newHackListService(okHttpClient: OkHttpClient, baseUrl: String): KiwixService {
-      val retrofit =
-        Retrofit.Builder()
-          .baseUrl(baseUrl)
-          .client(okHttpClient)
-          .addConverterFactory(SimpleXmlConverterFactory.create())
-          .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
-          .build()
+      val retrofit = Retrofit.Builder()
+        .baseUrl(baseUrl)
+        .client(okHttpClient)
+        .addConverterFactory(SimpleXmlConverterFactory.create())
+        .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
+        .build()
       return retrofit.create(KiwixService::class.java)
     }
   }

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt
@@ -50,28 +50,27 @@ abstract class ActivityModule {
     fun providesMainMenuFactory(
       activity: Activity,
       zimReaderContainer: ZimReaderContainer
-    ): MainMenu.Factory =
-      object : Factory {
-        override fun create(
-          menu: Menu,
-          webViews: MutableList<KiwixWebView>,
-          urlIsValid: Boolean,
-          menuClickListener: MenuClickListener,
-          disableReadAloud: Boolean,
-          disableTabs: Boolean,
-          disableSearch: Boolean
-        ): MainMenu =
-          MainMenu(
-            activity,
-            zimReaderContainer.zimFileReader,
-            menu,
-            webViews,
-            urlIsValid,
-            disableReadAloud,
-            disableTabs,
-            disableSearch,
-            menuClickListener
-          )
-      }
+    ): MainMenu.Factory = object : Factory {
+      override fun create(
+        menu: Menu,
+        webViews: MutableList<KiwixWebView>,
+        urlIsValid: Boolean,
+        menuClickListener: MenuClickListener,
+        disableReadAloud: Boolean,
+        disableTabs: Boolean,
+        disableSearch: Boolean
+      ): MainMenu =
+        MainMenu(
+          activity,
+          zimReaderContainer.zimFileReader,
+          menu,
+          webViews,
+          urlIsValid,
+          disableReadAloud,
+          disableTabs,
+          disableSearch,
+          menuClickListener
+        )
+    }
   }
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt
@@ -82,16 +82,15 @@ object DownloaderModule {
 
   @Provides
   @Singleton
-  fun provideOkHttpDownloader() =
-    OkHttpDownloader(
-      OkHttpClient.Builder()
-        .connectTimeout(CONNECT_TIME_OUT, TimeUnit.MINUTES)
-        .readTimeout(READ_TIME_OUT, TimeUnit.MINUTES)
-        .addInterceptor(BasicAuthInterceptor())
-        .followRedirects(true)
-        .followSslRedirects(true)
-        .build()
-    )
+  fun provideOkHttpDownloader() = OkHttpDownloader(
+    OkHttpClient.Builder()
+      .connectTimeout(CONNECT_TIME_OUT, TimeUnit.MINUTES)
+      .readTimeout(READ_TIME_OUT, TimeUnit.MINUTES)
+      .addInterceptor(BasicAuthInterceptor())
+      .followRedirects(true)
+      .followSslRedirects(true)
+      .build()
+  )
 
   @Provides
   @Singleton