From 78214dd255c55b06fa9895ea1b5186f12786eec9 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Fri, 10 Apr 2020 15:27:59 +0530
Subject: [PATCH] Use a publish processor for finishing action mode

Use a publish processor for finishing action mode
---
 .../org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt  | 2 +-
 .../org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt | 6 +-----
 .../zim_manager/fileselect_view/ZimFileSelectFragment.kt    | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
index 6d42efeec..c564d587b 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
@@ -75,7 +75,7 @@ class ZimManageActivity : BaseActivity() {
   }
 
   private fun updatePage(position: Int) {
-    zimManageViewModel.currentTabIndex(position)
+    zimManageViewModel.currentPage.offer(position)
   }
 
   override fun onNewIntent(intent: Intent?) {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
index 3e44b2b22..fb535d17d 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
@@ -103,12 +103,12 @@ class ZimManageViewModel @Inject constructor(
   val deviceListIsRefreshing = MutableLiveData<Boolean>()
   val libraryListIsRefreshing = MutableLiveData<Boolean>()
   val networkStates = MutableLiveData<NetworkState>()
-  val currentPage = MutableLiveData<Int>()
 
   val requestFileSystemCheck = PublishProcessor.create<Unit>()
   val fileSelectActions = PublishProcessor.create<FileSelectActions>()
   val requestDownloadLibrary = BehaviorProcessor.createDefault<Unit>(Unit)
   val requestFiltering = BehaviorProcessor.createDefault<String>("")
+  val currentPage = PublishProcessor.create<Int>()
 
   private val compositeDisposable = CompositeDisposable()
 
@@ -158,10 +158,6 @@ class ZimManageViewModel @Inject constructor(
     )
   }, Throwable::printStackTrace)
 
-  fun currentTabIndex(position: Int) {
-    currentPage.value = position
-  }
-
   private fun startMultiSelectionAndSelectBook(
     bookOnDisk: BookOnDisk
   ): StartMultiSelection {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
index a05a48962..b7a524bf8 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
@@ -112,11 +112,7 @@ class ZimFileSelectFragment : BaseFragment() {
       zimManageViewModel.fileSelectActions.offer(FileSelectActions.RestartActionMode)
     }
 
-    zimManageViewModel.currentPage.observe(viewLifecycleOwner, Observer<Int> { currentPage ->
-      if (currentPage == 1) {
-        finishActionMode()
-      }
-    })
+    zimManageViewModel.currentPage.map { it == 1 }.subscribe { if (it) finishActionMode() }
   }
 
   private fun finishActionMode() {