Fix build

app/proguard-rules.pro

@@ -35,10 +35,6 @@
 -keep class org.fourthline.cling.** { *; }
 -keep class javax.xml.** { *; }
 
-# Cronet
--keep class org.chromium.net.** { *; }
--keep class com.google.net.cronet.** { *; }
-
 # EXO
 -keep class org.xmlpull.v1.** { *; }
 

catvod/build.gradle

@@ -17,11 +17,9 @@ dependencies {
     api 'androidx.preference:preference:1.2.1'
     api('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' }
     api 'com.google.code.gson:gson:' + gsonVersion
-    api 'com.google.net.cronet:cronet-okhttp:0.1.0'
     api 'com.hierynomus:smbj:0.11.5'
     api 'com.orhanobut:logger:2.2.0'
     api 'com.squareup.okhttp3:okhttp:' + okhttpVersion
     api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion
-    api 'org.chromium.net:cronet-embedded:101.4951.41'
     api 'org.jsoup:jsoup:' + jsoupVersion
 }

danmaku/src/main/java/master/flame/danmaku/ui/widget/DanmakuTouchHelper.java

@@ -5,7 +5,7 @@ import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
 
-import javax.annotation.Nonnull;
+import androidx.annotation.NonNull;
 
 import master.flame.danmaku.controller.IDanmakuView;
 import master.flame.danmaku.danmaku.model.BaseDanmaku;
@@ -28,7 +28,7 @@ public class DanmakuTouchHelper {
         this.mDanmakuBounds = new RectF();
         this.mTouchDelegate = new GestureDetector(((View) danmakuView).getContext(), new GestureDetector.SimpleOnGestureListener() {
             @Override
-            public boolean onDown(@Nonnull MotionEvent event) {
+            public boolean onDown(@NonNull MotionEvent event) {
                 IDanmakuView.OnDanmakuClickListener onDanmakuClickListener = danmakuView.getOnDanmakuClickListener();
                 if (onDanmakuClickListener != null) {
                     mXOff = danmakuView.getXOff();
@@ -39,7 +39,7 @@ public class DanmakuTouchHelper {
             }
 
             @Override
-            public boolean onSingleTapConfirmed(@Nonnull MotionEvent event) {
+            public boolean onSingleTapConfirmed(@NonNull MotionEvent event) {
                 IDanmakus clickDanmakus = touchHitDanmaku(event.getX(), event.getY());
                 boolean isEventConsumed = false;
                 if (!clickDanmakus.isEmpty()) {
@@ -52,7 +52,7 @@ public class DanmakuTouchHelper {
             }
 
             @Override
-            public void onLongPress(@Nonnull MotionEvent event) {
+            public void onLongPress(@NonNull MotionEvent event) {
                 IDanmakuView.OnDanmakuClickListener onDanmakuClickListener = danmakuView.getOnDanmakuClickListener();
                 if (onDanmakuClickListener == null) return;
                 mXOff = danmakuView.getXOff();