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

breaking(android): replace magic numbers with android.os.Build constants (#821)

Browse Source
This commit is contained in:
jcesarmobile 2020-11-24 15:49:09 +01:00 committed by GitHub
parent 85acc2a12a
commit 11b1347812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/android/InAppBrowser.java
View File

@ -269,8 +269,12 @@ public class InAppBrowser extends CordovaPlugin {
@SuppressLint("NewApi") @SuppressLint("NewApi")
@Override @Override
public void run() { public void run() {
currentClient.waitForBeforeload = false; if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
inAppWebView.setWebViewClient(currentClient); currentClient.waitForBeforeload = false;
inAppWebView.setWebViewClient(currentClient);
} else {
((InAppBrowserClient)inAppWebView.getWebViewClient()).waitForBeforeload = false;
}
inAppWebView.loadUrl(url); inAppWebView.loadUrl(url);
} }
}); });
@ -410,7 +414,7 @@ public class InAppBrowser extends CordovaPlugin {
@SuppressLint("NewApi") @SuppressLint("NewApi")
@Override @Override
public void run() { public void run() {
if (Build.VERSION.SDK_INT < 19) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
// This action will have the side-effect of blurring the currently focused element // This action will have the side-effect of blurring the currently focused element
inAppWebView.loadUrl("javascript:" + finalScriptToInject); inAppWebView.loadUrl("javascript:" + finalScriptToInject);
} else { } else {
@ -1002,7 +1006,7 @@ public class InAppBrowser extends CordovaPlugin {
} }
} }
if(android.os.Build.VERSION.SDK_INT >= 17) { if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
settings.setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture); settings.setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
inAppWebView.addJavascriptInterface(new JsObject(), "cordova_iab"); inAppWebView.addJavascriptInterface(new JsObject(), "cordova_iab");
} }
@ -1034,7 +1038,7 @@ public class InAppBrowser extends CordovaPlugin {
} }
// Enable Thirdparty Cookies on >=Android 5.0 device // Enable Thirdparty Cookies on >=Android 5.0 device
if (android.os.Build.VERSION.SDK_INT >= 21) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
CookieManager.getInstance().setAcceptThirdPartyCookies(inAppWebView,true); CookieManager.getInstance().setAcceptThirdPartyCookies(inAppWebView,true);
} }
@ -1128,7 +1132,7 @@ public class InAppBrowser extends CordovaPlugin {
*/ */
public void onActivityResult(int requestCode, int resultCode, Intent intent) { public void onActivityResult(int requestCode, int resultCode, Intent intent) {
// For Android >= 5.0 // For Android >= 5.0
if(Build.VERSION.SDK_INT >= 21) { if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
LOG.d(LOG_TAG, "onActivityResult (For Android >= 5.0)"); LOG.d(LOG_TAG, "onActivityResult (For Android >= 5.0)");
// If RequestCode or Callback is Invalid // If RequestCode or Callback is Invalid
if(requestCode != FILECHOOSER_REQUESTCODE_LOLLIPOP || mUploadCallbackLollipop == null) { if(requestCode != FILECHOOSER_REQUESTCODE_LOLLIPOP || mUploadCallbackLollipop == null) {
@ -1201,7 +1205,7 @@ public class InAppBrowser extends CordovaPlugin {
* @param webView * @param webView
* @param request * @param request
*/ */
@TargetApi(24) @TargetApi(Build.VERSION_CODES.N)
@Override @Override
public boolean shouldOverrideUrlLoading(WebView webView, WebResourceRequest request) { public boolean shouldOverrideUrlLoading(WebView webView, WebResourceRequest request) {
return shouldOverrideUrlLoading(request.getUrl().toString(), request.getMethod()); return shouldOverrideUrlLoading(request.getUrl().toString(), request.getMethod());
@ -1373,7 +1377,7 @@ public class InAppBrowser extends CordovaPlugin {
* @param webView * @param webView
* @param request * @param request
*/ */
@TargetApi(21) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override @Override
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
return shouldInterceptRequest(request.getUrl().toString(), super.shouldInterceptRequest(view, request), request.getMethod()); return shouldInterceptRequest(request.getUrl().toString(), super.shouldInterceptRequest(view, request), request.getMethod());
@ -1424,12 +1428,12 @@ public class InAppBrowser extends CordovaPlugin {
super.onPageFinished(view, url); super.onPageFinished(view, url);
// Set the namespace for postMessage() // Set the namespace for postMessage()
if (Build.VERSION.SDK_INT >= 17) { if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
injectDeferredObject("window.webkit={messageHandlers:{cordova_iab:cordova_iab}}", null); injectDeferredObject("window.webkit={messageHandlers:{cordova_iab:cordova_iab}}", null);
} }
// CB-10395 InAppBrowser's WebView not storing cookies reliable to local device storage // CB-10395 InAppBrowser's WebView not storing cookies reliable to local device storage
if (android.os.Build.VERSION.SDK_INT >= 21) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
CookieManager.getInstance().flush(); CookieManager.getInstance().flush();
} else { } else {
CookieSyncManager.getInstance().sync(); CookieSyncManager.getInstance().sync();