From 73119a4f01f236c5f10bc13db943b66133642cae Mon Sep 17 00:00:00 2001
From: Yashwant <yashwantsandey2000@gmail.com>
Date: Sat, 21 Mar 2020 21:15:06 +0530
Subject: [PATCH 1/2] Hide "View from other books" switch in action mode from
 bookmarks and history list.

---
 .../org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java  | 2 ++
 .../org/kiwix/kiwixmobile/core/history/HistoryActivity.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java
index 5d43c22ba..e734283b3 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java
@@ -84,6 +84,7 @@ public class BookmarksActivity extends BaseActivity implements BookmarksContract
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
       mode.getMenuInflater().inflate(R.menu.menu_context_delete, menu);
+      bookmarksSwitch.setVisibility(View.INVISIBLE);
       return true;
     }
 
@@ -119,6 +120,7 @@ public class BookmarksActivity extends BaseActivity implements BookmarksContract
       if (refreshAdapter) {
         bookmarksAdapter.notifyDataSetChanged();
       }
+      bookmarksSwitch.setVisibility(View.VISIBLE);
     }
   };
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java
index 02f7263d5..4f8838ca5 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java
@@ -87,6 +87,7 @@ public class HistoryActivity extends BaseActivity implements HistoryContract.Vie
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
       mode.getMenuInflater().inflate(R.menu.menu_context_delete, menu);
+      historySwitch.setVisibility(View.INVISIBLE);
       return true;
     }
 
@@ -136,6 +137,7 @@ public class HistoryActivity extends BaseActivity implements HistoryContract.Vie
       if (refreshAdapter) {
         historyAdapter.notifyDataSetChanged();
       }
+      historySwitch.setVisibility(View.VISIBLE);
     }
   };
 

From a41721cb3b4799eb7817a5b92d85c8cace3563bd Mon Sep 17 00:00:00 2001
From: Yashwant <yashwantsandey2000@gmail.com>
Date: Sat, 21 Mar 2020 22:47:40 +0530
Subject: [PATCH 2/2] Hide "View from other books" switch in action mode from
 bookmarks and history list.

---
 .../kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java    | 4 ++--
 .../org/kiwix/kiwixmobile/core/history/HistoryActivity.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java
index e734283b3..67940fb7a 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java
@@ -84,7 +84,7 @@ public class BookmarksActivity extends BaseActivity implements BookmarksContract
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
       mode.getMenuInflater().inflate(R.menu.menu_context_delete, menu);
-      bookmarksSwitch.setVisibility(View.INVISIBLE);
+      bookmarksSwitch.setEnabled(false);
       return true;
     }
 
@@ -120,7 +120,7 @@ public class BookmarksActivity extends BaseActivity implements BookmarksContract
       if (refreshAdapter) {
         bookmarksAdapter.notifyDataSetChanged();
       }
-      bookmarksSwitch.setVisibility(View.VISIBLE);
+      bookmarksSwitch.setEnabled(true);
     }
   };
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java
index 4f8838ca5..7590ab823 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java
@@ -87,7 +87,7 @@ public class HistoryActivity extends BaseActivity implements HistoryContract.Vie
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
       mode.getMenuInflater().inflate(R.menu.menu_context_delete, menu);
-      historySwitch.setVisibility(View.INVISIBLE);
+      historySwitch.setEnabled(false);
       return true;
     }
 
@@ -137,7 +137,7 @@ public class HistoryActivity extends BaseActivity implements HistoryContract.Vie
       if (refreshAdapter) {
         historyAdapter.notifyDataSetChanged();
       }
-      historySwitch.setVisibility(View.VISIBLE);
+      historySwitch.setEnabled(true);
     }
   };