Add cronet back

pull/171/head
FongMi 2 years ago
parent f051c44668
commit f7688ff129
  1. 4
      app/build.gradle
  2. 4
      app/proguard-rules.pro
  3. 3
      app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomSelector.java
  4. 2
      app/src/main/java/com/fongmi/android/tv/App.java
  5. 2
      app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
  6. 3
      app/src/main/java/com/fongmi/android/tv/player/extractor/Push.java
  7. 2
      catvod/build.gradle
  8. 3
      catvod/src/main/java/com/github/catvod/net/OkHttp.java
  9. 3
      pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java

@ -112,9 +112,13 @@ dependencies {
implementation 'com.github.bumptech.glide:okhttp3-integration:4.15.1'
implementation 'com.github.jahirfiquitiva:TextDrawable:1.0.3'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:289db1178ab66694c23893e6a487d4708343c47b'
implementation('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' }
implementation 'com.google.android.material:material:1.10.0'
implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
implementation 'com.google.zxing:core:3.3.0'
implementation 'com.guolindev.permissionx:permissionx:1.7.1'
implementation 'com.hierynomus:smbj:0.11.5'
implementation 'org.chromium.net:cronet-embedded:76.3809.111'
implementation 'org.eclipse.jetty:jetty-client:8.1.21.v20160908'
implementation 'org.eclipse.jetty:jetty-server:8.1.21.v20160908'
implementation 'org.eclipse.jetty:jetty-servlet:8.1.21.v20160908'

@ -35,6 +35,10 @@
-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.** { *; }

@ -1,6 +1,7 @@
package com.fongmi.android.tv.ui.custom;
import androidx.collection.ArrayMap;
import android.util.ArrayMap;
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.PresenterSelector;

@ -11,12 +11,10 @@ import android.os.Looper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.HandlerCompat;
import androidx.media3.common.util.Log;
import com.fongmi.android.tv.api.LiveConfig;
import com.fongmi.android.tv.ui.activity.CrashActivity;
import com.fongmi.android.tv.utils.Notify;
import com.fongmi.android.tv.utils.Sniffer;
import com.github.catvod.Init;
import com.github.catvod.bean.Doh;
import com.github.catvod.net.OkHttp;

@ -2,8 +2,8 @@ package com.fongmi.android.tv.model;
import android.net.Uri;
import android.text.TextUtils;
import android.util.ArrayMap;
import androidx.collection.ArrayMap;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;

@ -1,10 +1,7 @@
package com.fongmi.android.tv.player.extractor;
import android.net.Uri;
import android.os.SystemClock;
import androidx.fragment.app.FragmentActivity;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.player.Source;
import com.fongmi.android.tv.ui.activity.VideoActivity;

@ -15,9 +15,7 @@ dependencies {
api project(':media-lib-common')
api 'androidx.annotation:annotation:' + annotationVersion
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.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

@ -1,8 +1,7 @@
package com.github.catvod.net;
import android.net.Uri;
import androidx.collection.ArrayMap;
import android.util.ArrayMap;
import com.github.catvod.bean.Doh;
import com.github.catvod.utils.Path;

@ -2,8 +2,7 @@ package com.undcover.freedom.pyramid;
import android.content.Context;
import android.text.TextUtils;
import androidx.collection.ArrayMap;
import android.util.ArrayMap;
import com.chaquo.python.PyObject;
import com.github.catvod.net.OkHttp;

Loading…
Cancel
Save