From 22a29b8ed8b15fd1c64187cb256b1e9f414373cc Mon Sep 17 00:00:00 2001 From: HissPirat Date: Wed, 26 Aug 2020 14:34:29 +0200 Subject: [PATCH] #2338 fixed actionBar and webViewList leaks. --- .../kiwix/kiwixmobile/core/main/CoreReaderFragment.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java index a46c4cae7..e84752080 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java @@ -112,13 +112,13 @@ import org.kiwix.kiwixmobile.core.reader.ZimFileReader; import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer; import org.kiwix.kiwixmobile.core.search.SearchActivity; import org.kiwix.kiwixmobile.core.search.viewmodel.effects.SearchInPreviousScreen; -import org.kiwix.kiwixmobile.core.utils.dialog.DialogShower; import org.kiwix.kiwixmobile.core.utils.ExternalLinkOpener; -import org.kiwix.kiwixmobile.core.utils.dialog.KiwixDialog; import org.kiwix.kiwixmobile.core.utils.LanguageUtils; import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil; import org.kiwix.kiwixmobile.core.utils.StyleUtils; import org.kiwix.kiwixmobile.core.utils.UpdateUtils; +import org.kiwix.kiwixmobile.core.utils.dialog.DialogShower; +import org.kiwix.kiwixmobile.core.utils.dialog.KiwixDialog; import org.kiwix.kiwixmobile.core.utils.files.FileUtils; import static android.app.Activity.RESULT_CANCELED; @@ -728,6 +728,8 @@ public abstract class CoreReaderFragment extends BaseFragment tabCallback = null; hideBackToTopTimer.cancel(); hideBackToTopTimer = null; + webViewList.clear(); + actionBar = null; tableDrawerAdapter.setTableClickListener(null); tableDrawerAdapter = null; unbinder.unbind(); @@ -1655,7 +1657,8 @@ public abstract class CoreReaderFragment extends BaseFragment } } selectTab(currentTab); - webViewList.get(currentTab).loadUrl(UpdateUtils.reformatProviderUrl(urls.getString(currentTab))); + webViewList.get(currentTab) + .loadUrl(UpdateUtils.reformatProviderUrl(urls.getString(currentTab))); getCurrentWebView().setScrollY(positions.getInt(currentTab)); } catch (JSONException e) { Log.w(TAG_KIWIX, "Kiwix shared preferences corrupted", e);