From f8b8e6ed2d146955ed2bf40965bf93c70a0ff99b Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Fri, 31 Jul 2020 15:54:58 +0200
Subject: [PATCH] #2242 fixed one leak, much better performance

---
 .../nav/destination/library/LocalLibraryFragment.kt         | 6 ++++++
 .../nav/destination/library/OnlineLibraryFragment.kt        | 5 +++++
 .../kiwixmobile/nav/destination/reader/ReaderFragment.kt    | 5 +++++
 .../zim_manager/fileselect_view/ZimFileSelectFragment.kt    | 5 +++++
 .../org/kiwix/kiwixmobile/core/main/TableDrawerAdapter.java | 3 ++-
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt
index 8516bbab3..c8a961594 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt
@@ -25,6 +25,7 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import kotlinx.android.synthetic.main.fragment_destination_library.go_to_downloads_button_no_files
 import org.kiwix.kiwixmobile.R
@@ -59,6 +60,11 @@ class LocalLibraryFragment : ZimFileSelectFragment() {
     baseActivity.kiwixActivityComponent.inject(this)
   }
 
+  override fun onDestroyView() {
+    super.onDestroyView()
+    (activity as AppCompatActivity).setSupportActionBar(null)
+  }
+
   override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
     inflater.inflate(R.menu.menu_zim_manager, menu)
     val searchItem = menu.findItem(R.id.action_search)
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
index 9b8eed431..19b2117de 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragment.kt
@@ -57,6 +57,11 @@ class OnlineLibraryFragment : LibraryFragment(), BaseFragmentActivityExtensions
     zimManageViewModel.requestFiltering.onNext("")
   }
 
+  override fun onDestroyView() {
+    super.onDestroyView()
+    (activity as AppCompatActivity).setSupportActionBar(null)
+  }
+
   override fun onBackPressed(activity: AppCompatActivity): BaseFragmentActivityExtensions.Super {
     getActivity()?.finish()
     return BaseFragmentActivityExtensions.Super.ShouldNotCall
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt
index 9fe7a20fe..39c021232 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt
@@ -238,6 +238,11 @@ class ReaderFragment : CoreReaderFragment() {
     )
   }
 
+  override fun onDestroyView() {
+    super.onDestroyView()
+    (activity as AppCompatActivity).setSupportActionBar(null)
+  }
+
   override fun openFullScreen() {
     super.openFullScreen()
     requireActivity().bottom_nav_view.visibility = GONE
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 99c8ae69f..b580504d0 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
@@ -84,6 +84,11 @@ open class ZimFileSelectFragment : BaseFragment() {
     baseActivity.kiwixActivityComponent.inject(this)
   }
 
+  override fun onDestroyView() {
+    super.onDestroyView()
+    actionMode = null
+  }
+
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/TableDrawerAdapter.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/TableDrawerAdapter.java
index fe54a1229..58efeeeb2 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/TableDrawerAdapter.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/TableDrawerAdapter.java
@@ -72,7 +72,8 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         vh.title.setText(title);
       } else {
         String empty = context.getString(R.string.no_section_info);
-        if (context instanceof WebViewProvider) {
+        if (context instanceof WebViewProvider
+          && ((WebViewProvider) context).getCurrentWebView() != null) {
           empty = ((WebViewProvider) context).getCurrentWebView().getTitle();
         }
         vh.title.setText(empty);