Skip to content

Commit 590da0c

Browse files
jcesarmobileFE-Roger
authored andcommitted
breaking(android): replace magic numbers with android.os.Build constants (apache#821)
1 parent 4216ac0 commit 590da0c

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

src/android/InAppBrowser.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,12 @@ else if (action.equals("loadAfterBeforeload")) {
275275
@SuppressLint("NewApi")
276276
@Override
277277
public void run() {
278-
currentClient.waitForBeforeload = false;
279-
inAppWebView.setWebViewClient(currentClient);
278+
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
279+
currentClient.waitForBeforeload = false;
280+
inAppWebView.setWebViewClient(currentClient);
281+
} else {
282+
((InAppBrowserClient)inAppWebView.getWebViewClient()).waitForBeforeload = false;
283+
}
280284
inAppWebView.loadUrl(url);
281285
}
282286
});
@@ -416,7 +420,7 @@ private void injectDeferredObject(String source, String jsWrapper) {
416420
@SuppressLint("NewApi")
417421
@Override
418422
public void run() {
419-
if (Build.VERSION.SDK_INT < 19) {
423+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
420424
// This action will have the side-effect of blurring the currently focused element
421425
inAppWebView.loadUrl("javascript:" + finalScriptToInject);
422426
} else {
@@ -1083,7 +1087,7 @@ public void postMessage(String data) {
10831087
}
10841088
}
10851089

1086-
if(android.os.Build.VERSION.SDK_INT >= 17) {
1090+
if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
10871091
settings.setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
10881092
inAppWebView.addJavascriptInterface(new JsObject(), "cordova_iab");
10891093
}
@@ -1115,7 +1119,7 @@ public void postMessage(String data) {
11151119
}
11161120

11171121
// Enable Thirdparty Cookies on >=Android 5.0 device
1118-
if (android.os.Build.VERSION.SDK_INT >= 21) {
1122+
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
11191123
CookieManager.getInstance().setAcceptThirdPartyCookies(inAppWebView,true);
11201124
}
11211125

@@ -1210,7 +1214,7 @@ private void sendUpdate(JSONObject obj, boolean keepCallback, PluginResult.Statu
12101214
*/
12111215
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
12121216
// For Android >= 5.0
1213-
if(Build.VERSION.SDK_INT >= 21) {
1217+
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
12141218
LOG.d(LOG_TAG, "onActivityResult (For Android >= 5.0)");
12151219
// If RequestCode or Callback is Invalid
12161220
if(requestCode != FILECHOOSER_REQUESTCODE_LOLLIPOP || mUploadCallbackLollipop == null) {
@@ -1283,7 +1287,7 @@ public boolean shouldOverrideUrlLoading(WebView webView, String url) {
12831287
* @param webView
12841288
* @param request
12851289
*/
1286-
@TargetApi(24)
1290+
@TargetApi(Build.VERSION_CODES.N)
12871291
@Override
12881292
public boolean shouldOverrideUrlLoading(WebView webView, WebResourceRequest request) {
12891293
return shouldOverrideUrlLoading(request.getUrl().toString(), request.getMethod());
@@ -1488,7 +1492,7 @@ public WebResourceResponse shouldInterceptRequest (final WebView view, String ur
14881492
* @param webView
14891493
* @param request
14901494
*/
1491-
@TargetApi(21)
1495+
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
14921496
@Override
14931497
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
14941498
return shouldInterceptRequest(request.getUrl().toString(), super.shouldInterceptRequest(view, request), request.getMethod());
@@ -1539,12 +1543,12 @@ public void onPageFinished(WebView view, String url) {
15391543
super.onPageFinished(view, url);
15401544

15411545
// Set the namespace for postMessage()
1542-
if (Build.VERSION.SDK_INT >= 17) {
1546+
if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
15431547
injectDeferredObject("window.webkit={messageHandlers:{cordova_iab:cordova_iab}}", null);
15441548
}
15451549

15461550
// CB-10395 InAppBrowser's WebView not storing cookies reliable to local device storage
1547-
if (android.os.Build.VERSION.SDK_INT >= 21) {
1551+
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
15481552
CookieManager.getInstance().flush();
15491553
} else {
15501554
CookieSyncManager.getInstance().sync();

0 commit comments

Comments
 (0)