diff --git a/doc/index.md b/doc/index.md index 5d5572e..d60e3d2 100644 --- a/doc/index.md +++ b/doc/index.md @@ -61,7 +61,6 @@ instance, or the system browser. Android only: - - __closebuttoncaption__: set to a string to use as the __Done__ button's caption. - __hidden__: set to `yes` to create the browser and load the page, but not show it. The loadstop event fires when loading is complete. Omit or set to `no` (default) to have the browser open and load normally. - __clearcache__: set to `yes` to have the browser's cookie cache cleared before the new window is opened - __clearsessioncache__: set to `yes` to have the session cookie cache cleared before the new window is opened diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java index f97e0b2..ac70307 100644 --- a/src/android/InAppBrowser.java +++ b/src/android/InAppBrowser.java @@ -75,7 +75,6 @@ public class InAppBrowser extends CordovaPlugin { private static final String LOAD_START_EVENT = "loadstart"; private static final String LOAD_STOP_EVENT = "loadstop"; private static final String LOAD_ERROR_EVENT = "loaderror"; - private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption"; private static final String CLEAR_ALL_CACHE = "clearcache"; private static final String CLEAR_SESSION_CACHE = "clearsessioncache"; @@ -85,7 +84,6 @@ public class InAppBrowser extends CordovaPlugin { private CallbackContext callbackContext; private boolean showLocationBar = true; private boolean openWindowHidden = false; - private String buttonLabel = "Done"; private boolean clearAllCache= false; private boolean clearSessionCache=false; @@ -287,12 +285,8 @@ public class InAppBrowser extends CordovaPlugin { option = new StringTokenizer(features.nextToken(), "="); if (option.hasMoreElements()) { String key = option.nextToken(); - if (key.equalsIgnoreCase(CLOSE_BUTTON_CAPTION)) { - this.buttonLabel = option.nextToken(); - } else { - Boolean value = option.nextToken().equals("no") ? Boolean.FALSE : Boolean.TRUE; - map.put(key, value); - } + Boolean value = option.nextToken().equals("no") ? Boolean.FALSE : Boolean.TRUE; + map.put(key, value); } } return map; @@ -460,6 +454,7 @@ public class InAppBrowser extends CordovaPlugin { return value; } + @SuppressLint("NewApi") public void run() { // Let's create the main dialog dialog = new InAppBrowserDialog(cordova.getActivity(), android.R.style.Theme_NoTitleBar); @@ -495,9 +490,6 @@ public class InAppBrowser extends CordovaPlugin { back.setLayoutParams(backLayoutParams); back.setContentDescription("Back Button"); back.setId(2); - /* - back.setText("<"); - */ Resources activityRes = cordova.getActivity().getResources(); int backResId = activityRes.getIdentifier("ic_action_previous_item", "drawable", cordova.getActivity().getPackageName()); Drawable backIcon = activityRes.getDrawable(backResId); @@ -522,7 +514,6 @@ public class InAppBrowser extends CordovaPlugin { forward.setLayoutParams(forwardLayoutParams); forward.setContentDescription("Forward Button"); forward.setId(3); - //forward.setText(">"); int fwdResId = activityRes.getIdentifier("ic_action_next_item", "drawable", cordova.getActivity().getPackageName()); Drawable fwdIcon = activityRes.getDrawable(fwdResId); if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) @@ -562,14 +553,13 @@ public class InAppBrowser extends CordovaPlugin { } }); - // Close button + // Close/Done button Button close = new Button(cordova.getActivity()); RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT); closeLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); close.setLayoutParams(closeLayoutParams); forward.setContentDescription("Close Button"); close.setId(5); - //close.setText(buttonLabel); int closeResId = activityRes.getIdentifier("ic_action_remove", "drawable", cordova.getActivity().getPackageName()); Drawable closeIcon = activityRes.getDrawable(closeResId); if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) @@ -650,7 +640,7 @@ public class InAppBrowser extends CordovaPlugin { // 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 if(openWindowHidden) { - dialog.hide(); + dialog.hide(); } } }; @@ -683,8 +673,6 @@ public class InAppBrowser extends CordovaPlugin { } } } - - /** * The webview client receives notifications about appView @@ -815,7 +803,6 @@ public class InAppBrowser extends CordovaPlugin { } catch (JSONException ex) { Log.d(LOG_TAG, "Should never happen"); } - } } }