Skip to content

Commit 17d2ada

Browse files
authored
feat(android): remove RequiresApi annotation and drop support for API 19 (#540)
BREAKING CHANGE: Drop Android 4.4 support (SDK API level 19). Min required is 21.
1 parent fac7020 commit 17d2ada

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

plugin.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
<source-file src="src/android/com/ionicframework/cordova/webview/AndroidProtocolHandler.java" target-dir="src/com/ionicframework/cordova/webview"/>
5353
<source-file src="src/android/com/ionicframework/cordova/webview/UriMatcher.java" target-dir="src/com/ionicframework/cordova/webview"/>
5454
<source-file src="src/android/com/ionicframework/cordova/webview/WebViewLocalServer.java" target-dir="src/com/ionicframework/cordova/webview"/>
55-
<preference name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" default="27.+"/>
56-
<framework src="com.android.support:support-annotations:$ANDROID_SUPPORT_ANNOTATIONS_VERSION"/>
5755
</platform>
5856

5957
<!-- ios -->

src/android/com/ionicframework/cordova/webview/IonicWebViewEngine.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import android.content.Context;
55
import android.content.SharedPreferences;
66
import android.content.pm.PackageInfo;
7-
import android.annotation.TargetApi;
87
import android.graphics.Bitmap;
98
import android.net.Uri;
109
import android.os.Build;
11-
import android.support.annotation.RequiresApi;
1210
import android.util.Log;
1311
import android.webkit.ServiceWorkerController;
1412
import android.webkit.ServiceWorkerClient;
@@ -134,18 +132,11 @@ public ServerClient(SystemWebViewEngine parentEngine, ConfigXmlParser parser) {
134132
this.parser = parser;
135133
}
136134

137-
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
138135
@Override
139136
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
140137
return localServer.shouldInterceptRequest(request.getUrl(), request);
141138
}
142139

143-
@TargetApi(Build.VERSION_CODES.KITKAT)
144-
@Override
145-
public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
146-
return localServer.shouldInterceptRequest(Uri.parse(url), null);
147-
}
148-
149140
@Override
150141
public void onPageStarted(WebView view, String url, Bitmap favicon) {
151142
super.onPageStarted(view, url, favicon);

0 commit comments

Comments
 (0)