From 76bc6719bd9fab92b915a6b11094d5ca9e9f8c9f Mon Sep 17 00:00:00 2001
From: Albert Papp <albert.papp@blacksalt.io>
Date: Mon, 5 Nov 2018 21:57:22 +0100
Subject: [PATCH 1/2] Do not call onReceiveValue on null reference

---
 .../main/java/com/flutter_webview_plugin/WebviewManager.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java b/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java
index 5fd97169..8fc5abec 100644
--- a/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java
+++ b/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java
@@ -52,7 +52,8 @@ public boolean handleResult(int requestCode, int resultCode, Intent intent){
                         handled = true;
                     }
                 }
-                mUploadMessageArray.onReceiveValue(results);
+                if (mUploadMessageArray != null)
+                    mUploadMessageArray.onReceiveValue(results);
                 mUploadMessageArray = null;
             }else {
                 if (requestCode == FILECHOOSER_RESULTCODE) {

From efc5d950c1379085abea7f34eaceb2bda594540f Mon Sep 17 00:00:00 2001
From: Simon Lightfoot <simon@devangels.london>
Date: Wed, 14 Nov 2018 23:55:48 +0000
Subject: [PATCH 2/2] Update WebviewManager.java

---
 .../java/com/flutter_webview_plugin/WebviewManager.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java b/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java
index 8fc5abec..e7c89bb0 100644
--- a/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java
+++ b/android/src/main/java/com/flutter_webview_plugin/WebviewManager.java
@@ -52,15 +52,18 @@ public boolean handleResult(int requestCode, int resultCode, Intent intent){
                         handled = true;
                     }
                 }
-                if (mUploadMessageArray != null)
+                if (mUploadMessageArray != null){
                     mUploadMessageArray.onReceiveValue(results);
+                }
                 mUploadMessageArray = null;
             }else {
                 if (requestCode == FILECHOOSER_RESULTCODE) {
                     if (null != mUploadMessage) {
                         Uri result = intent == null || resultCode != RESULT_OK ? null
                                 : intent.getData();
-                        mUploadMessage.onReceiveValue(result);
+                        if (mUploadMessageArray != null){
+                            mUploadMessageArray.onReceiveValue(results);
+                        }
                         mUploadMessage = null;
                     }
                     handled = true;