zhaidi/cordova-plugin-inappbrowser
zhaidi/cordova-plugin-inappbrowser
1
0
Fork 0
forked from public/cordova-plugin-inappbrowser
Code Pull Requests Activity

(android) improve defensive code for NULL check

Browse Source
This commit is contained in:
Niklas Merz 2020-01-02 19:53:36 +01:00
parent 0411a287b8
commit d4338bd64a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/android/InAppBrowser.java
View File

@ -313,7 +313,7 @@ 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() {
if(dialog != null){ if (dialog != null) {
dialog.show(); dialog.show();
} }
} }
@ -326,7 +326,7 @@ 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() {
if(dialog != null){ if (dialog != null) {
dialog.hide(); dialog.hide();
} }
} }
@ -1069,19 +1069,17 @@ public class InAppBrowser extends CordovaPlugin {
lp.width = WindowManager.LayoutParams.MATCH_PARENT; lp.width = WindowManager.LayoutParams.MATCH_PARENT;
lp.height = WindowManager.LayoutParams.MATCH_PARENT; lp.height = WindowManager.LayoutParams.MATCH_PARENT;
if (dialog != null) {
dialog.setContentView(main); dialog.setContentView(main);
if(dialog != null){
dialog.show(); 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 != null) {
if(dialog != null){
dialog.hide(); dialog.hide();
} }
} }
}
}; };
this.cordova.getActivity().runOnUiThread(runnable); this.cordova.getActivity().runOnUiThread(runnable);
return ""; return "";