github/apache-cordova-plugin-inappbrowser
github/apache-cordova-plugin-inappbrowser
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(android) defensive code to prevent NULL reference exceptions for async

Browse Source 
Signed-off-by: Niklas Merz <niklasmerz@apache.org>
This commit is contained in:
Alex Yaz 2019-03-26 10:46:49 -04:00 committed by Niklas Merz
parent 416b05c1e5
commit 0411a287b8
No known key found for this signature in database
GPG Key ID: 9D0402820FB84764
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/android/InAppBrowser.java
View File

@ -313,7 +313,9 @@ public class InAppBrowser extends CordovaPlugin {
this.cordova.getActivity().runOnUiThread(new Runnable() { this.cordova.getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
dialog.show(); if(dialog != null){
dialog.show();
}
} }
}); });
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK); PluginResult pluginResult = new PluginResult(PluginResult.Status.OK);
@ -324,7 +326,9 @@ public class InAppBrowser extends CordovaPlugin {
this.cordova.getActivity().runOnUiThread(new Runnable() { this.cordova.getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
dialog.hide(); if(dialog != null){
dialog.hide();
}
} }
}); });
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK); PluginResult pluginResult = new PluginResult(PluginResult.Status.OK);
@ -1066,12 +1070,16 @@ public class InAppBrowser extends CordovaPlugin {
lp.height = WindowManager.LayoutParams.MATCH_PARENT; lp.height = WindowManager.LayoutParams.MATCH_PARENT;
dialog.setContentView(main); dialog.setContentView(main);
dialog.show(); if(dialog != null){
dialog.show();
}
dialog.getWindow().setAttributes(lp); dialog.getWindow().setAttributes(lp);
// the goal of openhidden is to load the url and not display it // the goal of openhidden is to load the url and not display it
// Show() needs to be called to cause the URL to be loaded // Show() needs to be called to cause the URL to be loaded
if(openWindowHidden) { if(openWindowHidden) {
dialog.hide(); if(dialog != null){
dialog.hide();
}
} }
} }
}; };