Skip to content

X5 3.0 advoid crash #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: x5-3.0
Choose a base branch
from
Open

X5 3.0 advoid crash #116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52f971
advoid crash when activity finishing
linguokun1 Mar 4, 2019
d18086b
advoid crash and extract method
linguokun1 Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions dsbridge/src/main/java/wendu/dsbridge/DWebView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,9 @@ public boolean onJsAlert(WebView view, String url, final String message, final J
return true;
}
}

if (isActivityFinishing()) return true;

Dialog alertDialog = new AlertDialog.Builder(getContext()).
setMessage(message).
setCancelable(false).
Expand Down Expand Up @@ -717,6 +720,9 @@ public void onClick(DialogInterface dialog, int which) {
}
}
};

if (isActivityFinishing()) return true;

new AlertDialog.Builder(getContext())
.setMessage(message)
.setCancelable(false)
Expand Down Expand Up @@ -765,6 +771,9 @@ public void onClick(DialogInterface dialog, int which) {
}
}
};

if (isActivityFinishing()) return true;

new AlertDialog.Builder(getContext())
.setTitle(message)
.setView(editText)
Expand Down Expand Up @@ -907,6 +916,22 @@ public void openFileChooser(ValueCallback valueCallback, String acceptType) {

};

private boolean isActivityFinishing() {
Context context = getContext();
if (context instanceof Activity) {
Activity activity = (Activity) context;
if (activity.isFinishing()) {
return true;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
if (activity.isDestroyed()) {
return true;
}
}
}
return false;
}

@Override
public void clearCache(boolean includeDiskFiles) {
super.clearCache(includeDiskFiles);
Expand Down