From 857173a98ee8a1978493c473abf0f2a78e2f9ced Mon Sep 17 00:00:00 2001 From: Abdul Wadood Date: Sat, 4 Aug 2018 21:53:28 +0530 Subject: [PATCH] Fix multiple addition of tabs --- .../main/java/org/kiwix/kiwixmobile/main/MainActivity.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index 052ca2ed2..ef66b03b4 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -751,8 +751,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback, @Override public boolean onOptionsItemSelected(MenuItem item) { - - KiwixWebView webView = getCurrentWebView(); switch (item.getItemId()) { case R.id.menu_new_tab: case android.R.id.home: @@ -768,7 +766,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback, case R.id.menu_searchintext: compatCallback.setActive(); - compatCallback.setWebView(webView); + compatCallback.setWebView(getCurrentWebView()); startSupportActionMode(compatCallback); compatCallback.showSoftInput(); break; @@ -1140,7 +1138,8 @@ public class MainActivity extends BaseActivity implements WebViewCallback, } } - if (!webViewList.isEmpty() && webViewList.get(currentWebViewIndex).getUrl() != null && + if (!webViewList.isEmpty() && currentWebViewIndex < webViewList.size() && + webViewList.get(currentWebViewIndex).getUrl() != null && webViewList.get(currentWebViewIndex).getUrl().equals(HOME_URL) && webViewList.get(currentWebViewIndex).findViewById(R.id.get_content_card) != null) { webViewList.get(currentWebViewIndex).findViewById(R.id.get_content_card).setEnabled(true);