From 30f40c829f8cbc87128b5ac17a7ecd9e0e1be1cf Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Tue, 14 Apr 2020 16:23:09 +0530
Subject: [PATCH] Put the check in the view model

---
 .../kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt   | 8 ++++++++
 .../zim_manager/fileselect_view/ZimFileSelectFragment.kt  | 8 +++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

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 fb535d17d..379a37474 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
@@ -19,7 +19,9 @@
 package org.kiwix.kiwixmobile.zim_manager
 
 import android.app.Application
+import android.content.Context
 import androidx.annotation.VisibleForTesting
+import androidx.appcompat.view.ActionMode
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import io.reactivex.Flowable
@@ -144,6 +146,12 @@ class ZimManageViewModel @Inject constructor(
     )
   }
 
+  fun actionMode(actionMode: ActionMode?) {
+    currentPage.filter { it == 1 }.subscribe {
+      actionMode?.finish()
+    }
+  }
+
   private fun fileSelectActions() = fileSelectActions.subscribe({
     sideEffects.offer(
       when (it) {
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 b7a524bf8..41f62bea5 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,9 @@ class ZimFileSelectFragment : BaseFragment() {
       zimManageViewModel.fileSelectActions.offer(FileSelectActions.RestartActionMode)
     }
 
-    zimManageViewModel.currentPage.map { it == 1 }.subscribe { if (it) finishActionMode() }
-  }
-
-  private fun finishActionMode() {
-    actionMode?.finish()
+    zimManageViewModel.currentPage.subscribe {
+      zimManageViewModel.actionMode(actionMode)
+    }
   }
 
   private fun sideEffects() = zimManageViewModel.sideEffects.subscribe(