Skip to content

Commit 227ca69

Browse files
authored
Merge pull request #227 from palbert75/master
Do not call onReceiveValue on null reference
2 parents dcff178 + efc5d95 commit 227ca69

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

android/src/main/java/com/flutter_webview_plugin/WebviewManager.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,18 @@ public boolean handleResult(int requestCode, int resultCode, Intent intent){
5252
handled = true;
5353
}
5454
}
55-
mUploadMessageArray.onReceiveValue(results);
55+
if (mUploadMessageArray != null){
56+
mUploadMessageArray.onReceiveValue(results);
57+
}
5658
mUploadMessageArray = null;
5759
}else {
5860
if (requestCode == FILECHOOSER_RESULTCODE) {
5961
if (null != mUploadMessage) {
6062
Uri result = intent == null || resultCode != RESULT_OK ? null
6163
: intent.getData();
62-
mUploadMessage.onReceiveValue(result);
64+
if (mUploadMessageArray != null){
65+
mUploadMessageArray.onReceiveValue(results);
66+
}
6367
mUploadMessage = null;
6468
}
6569
handled = true;

0 commit comments

Comments
 (0)