#

Author: Justson

library/src/main/java/com/just/library/DefaultChromeClient.java

@@ -116,7 +116,7 @@ public boolean onJsAlert(WebView view, String url, String message, JsResult resu
         }
 
         Activity mActivity = this.mActivityWeakReference.get();
-        if (mActivity == null) {
+        if (mActivity == null||mActivity.isFinishing()) {
             result.cancel();
             return true;
         }
@@ -274,7 +274,7 @@ private void toDismissDialog(Dialog dialog) {
     private void showJsConfirm(String message, final JsResult result) {
 
         Activity mActivity = this.mActivityWeakReference.get();
-        if (mActivity == null) {
+        if (mActivity == null||mActivity.isFinishing()) {
             result.cancel();
             return;
         }
@@ -311,7 +311,7 @@ private void toCancelJsresult(JsResult result) {
     private void showJsPrompt(String message, final JsPromptResult js, String defaultstr) {
 
         Activity mActivity = this.mActivityWeakReference.get();
-        if (mActivity == null) {
+        if (mActivity == null||mActivity.isFinishing()) {
             js.cancel();
             return;
         }
@@ -387,8 +387,10 @@ private void openFileChooserAboveL(WebView webView, ValueCallback<Uri[]> filePat
 
 
         Activity mActivity = this.mActivityWeakReference.get();
-        if (mActivity == null)
+        if (mActivity == null||mActivity.isFinishing()){
+            filePathCallback.onReceiveValue(new Uri[]{});
             return;
+        }
         IFileUploadChooser mIFileUploadChooser = this.mIFileUploadChooser;
         this.mIFileUploadChooser = mIFileUploadChooser = new FileUpLoadChooserImpl.Builder()
                 .setWebView(webView)
@@ -437,8 +439,10 @@ public void openFileChooser(ValueCallback valueCallback, String acceptType) {
 
     private void createAndOpenCommonFileLoader(ValueCallback valueCallback) {
         Activity mActivity = this.mActivityWeakReference.get();
-        if (mActivity == null)
+        if (mActivity == null||mActivity.isFinishing()){
+            valueCallback.onReceiveValue(new Object());
             return;
+        }
         this.mIFileUploadChooser = new FileUpLoadChooserImpl.Builder()
                 .setWebView(this.mWebView)
                 .setActivity(mActivity)

library/src/main/java/com/just/library/DefaultWebLifeCycleImpl.java

@@ -18,9 +18,9 @@ public class DefaultWebLifeCycleImpl implements WebLifeCycle {
     public void onResume() {
         if (this.mWebView != null) {
 
-            if (Build.VERSION.SDK_INT >= 11)
+            if (Build.VERSION.SDK_INT >= 11){
                 this.mWebView.onResume();
-
+            }
             this.mWebView.resumeTimers();
         }
 
@@ -31,9 +31,11 @@ public void onResume() {
     public void onPause() {
 
         if (this.mWebView != null) {
-            this.mWebView.pauseTimers();
-            if (Build.VERSION.SDK_INT >= 11)
+
+            if (Build.VERSION.SDK_INT >= 11){
                 this.mWebView.onPause();
+            }
+            this.mWebView.pauseTimers();
         }
     }