Skip to content

Commit ca47165

Browse files
authored
refactor(android): Remove SDK 24/N checks (#8084)
1 parent c44ef7e commit ca47165

File tree

4 files changed

+5
-25
lines changed

4 files changed

+5
-25
lines changed

android/capacitor/src/main/java/com/getcapacitor/Bridge.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ private void loadWebView() {
280280
webView.setWebChromeClient(new BridgeWebChromeClient(this));
281281
webView.setWebViewClient(this.webViewClient);
282282

283-
if (Build.VERSION.SDK_INT >= 24 && config.isResolveServiceWorkerRequests()) {
283+
if (config.isResolveServiceWorkerRequests()) {
284284
ServiceWorkerController swController = ServiceWorkerController.getInstance();
285285
swController.setServiceWorkerClient(
286286
new ServiceWorkerClient() {
@@ -348,11 +348,7 @@ public boolean isMinimumWebViewInstalled() {
348348

349349
// Otherwise manually check WebView versions
350350
try {
351-
String webViewPackage = "com.google.android.webview";
352-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
353-
webViewPackage = "com.android.chrome";
354-
}
355-
PackageInfo info = InternalUtils.getPackageInfo(pm, webViewPackage);
351+
PackageInfo info = InternalUtils.getPackageInfo(pm, "com.android.chrome");
356352
String majorVersionStr = info.versionName.split("\\.")[0];
357353
int majorVersion = Integer.parseInt(majorVersionStr);
358354
return majorVersion >= config.getMinWebViewVersion();

android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,8 @@ private boolean isMediaCaptureSupported() {
313313
}
314314

315315
private void showMediaCaptureOrFilePicker(ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams, boolean isVideo) {
316-
// TODO: add support for video capture on Android M and older
317-
// On Android M and lower the VIDEO_CAPTURE_INTENT (e.g.: intent.getData())
318-
// returns a file:// URI instead of the expected content:// URI.
319-
// So we disable it for now because it requires a bit more work
320-
boolean isVideoCaptureSupported = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N;
321-
boolean shown = false;
322-
if (isVideo && isVideoCaptureSupported) {
316+
boolean shown;
317+
if (isVideo) {
323318
shown = showVideoCapturePicker(filePathCallback);
324319
} else {
325320
shown = showImageCapturePicker(filePathCallback);

android/capacitor/src/main/java/com/getcapacitor/BridgeWebViewClient.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
2929
return bridge.launchIntent(url);
3030
}
3131

32-
@Deprecated
33-
@Override
34-
public boolean shouldOverrideUrlLoading(WebView view, String url) {
35-
return bridge.launchIntent(Uri.parse(url));
36-
}
37-
3832
@Override
3933
public void onPageFinished(WebView view, String url) {
4034
super.onPageFinished(view, url);

android/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -442,12 +442,7 @@ private void setDefaultRequestProperties() {
442442
* Builds and returns a locale string describing the device's current locale preferences.
443443
*/
444444
private String buildDefaultAcceptLanguageProperty() {
445-
Locale locale;
446-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
447-
locale = LocaleList.getDefault().get(0);
448-
} else {
449-
locale = Locale.getDefault();
450-
}
445+
Locale locale = LocaleList.getDefault().get(0);
451446
String result = "";
452447
String lang = locale.getLanguage();
453448
String country = locale.getCountry();

0 commit comments

Comments
 (0)