kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-27 23:20:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiple addition of tabs

Browse Source
This commit is contained in:
Abdul Wadood 2018-08-04 21:53:28 +05:30 committed by Isaac Hutt
parent 1e5df45927
commit 857173a98e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
View File

@ -751,8 +751,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
KiwixWebView webView = getCurrentWebView();
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.menu_new_tab: case R.id.menu_new_tab:
case android.R.id.home: case android.R.id.home:
@ -768,7 +766,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
case R.id.menu_searchintext: case R.id.menu_searchintext:
compatCallback.setActive(); compatCallback.setActive();
compatCallback.setWebView(webView); compatCallback.setWebView(getCurrentWebView());
startSupportActionMode(compatCallback); startSupportActionMode(compatCallback);
compatCallback.showSoftInput(); compatCallback.showSoftInput();
break; 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).getUrl().equals(HOME_URL) &&
webViewList.get(currentWebViewIndex).findViewById(R.id.get_content_card) != null) { webViewList.get(currentWebViewIndex).findViewById(R.id.get_content_card) != null) {
webViewList.get(currentWebViewIndex).findViewById(R.id.get_content_card).setEnabled(true); webViewList.get(currentWebViewIndex).findViewById(R.id.get_content_card).setEnabled(true);