remove redirect_image

GuhDoy · Nov 30, 2023 · 5199b18 · 5199b18
1 parent 941271e
commit 5199b18
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 101 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 def gitCommitCount = Integer.parseInt('git rev-list --count HEAD'.execute([], project.rootDir).text.trim())
-def sdk = 33
+def sdk = 34
 
 android {
     compileSdk sdk
-    buildToolsVersion = '33.0.2'
-    ndkVersion '25.2.9519653'
+    buildToolsVersion = '34.0.0'
+    ndkVersion '26.0.10792818'
 
     defaultConfig {
         applicationId 'gm.tieba.tabswitch'
@@ -67,16 +67,16 @@ android {
 dependencies {
     compileOnly 'de.robv.android.xposed:api:82'
     api 'androidx.annotation:annotation:1.7.0'
-    def roomVersion = '2.5.2'
+    def roomVersion = '2.6.0'
     implementation "androidx.room:room-runtime:$roomVersion"
     annotationProcessor "androidx.room:room-compiler:$roomVersion"
     implementation "androidx.room:room-ktx:$roomVersion"
     ksp "androidx.room:room-compiler:$roomVersion"
 
     implementation 'io.reactivex.rxjava3:rxjava:3.1.7'
-    implementation 'org.luckypray:dexkit:2.0.0-rc3'
+    implementation 'org.luckypray:dexkit:2.0.0-rc8'
     // https://stackoverflow.com/questions/61195038/excluding-dependency-from-implementation-files
     implementation files('apktool_2.7.0.jar')
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'dev.rikka.ndk.thirdparty:cxx:1.2.0'
 }
diff --git a/app/src/main/java/gm/tieba/tabswitch/XposedInit.java b/app/src/main/java/gm/tieba/tabswitch/XposedInit.java
@@ -53,7 +53,6 @@
 import gm.tieba.tabswitch.hooker.eliminate.SwitchManager;
 import gm.tieba.tabswitch.hooker.extra.ForbidGesture;
 import gm.tieba.tabswitch.hooker.extra.Hide;
-import gm.tieba.tabswitch.hooker.extra.RedirectImage;
 import gm.tieba.tabswitch.hooker.extra.StackTrace;
 import gm.tieba.tabswitch.util.DisplayUtils;
 import gm.tieba.tabswitch.widget.TbDialog;
@@ -100,7 +99,6 @@ protected void afterHookedMethod(final MethodHookParam param) throws Throwable {
                         new AutoSign(),
                         new OpenSign(),
                         new OriginSrc(),
-                        new RedirectImage(),
                         new ForbidGesture(),
                         new AgreeNum(),
                         new FrsTab(),

diff --git a/app/src/main/java/gm/tieba/tabswitch/hooker/TSPreference.java b/app/src/main/java/gm/tieba/tabswitch/hooker/TSPreference.java
@@ -234,7 +234,6 @@ private LinearLayout createRootPreference(final Activity activity) {
         preferenceLayout.addView(new SwitchButtonHolder(activity, "自动查看原图", "origin_src", SwitchButtonHolder.TYPE_SWITCH));
 
         preferenceLayout.addView(TSPreferenceHelper.createTextView(isPurgeEnabled ? "奇怪怪" : "其它"));
-        preferenceLayout.addView(new SwitchButtonHolder(activity, "使用媒体存储保存图片", "redirect_image", SwitchButtonHolder.TYPE_SWITCH));
         preferenceLayout.addView(new SwitchButtonHolder(activity, "禁用帖子手势", "forbid_gesture", SwitchButtonHolder.TYPE_SWITCH));
         preferenceLayout.addView(new SwitchButtonHolder(activity, "用赞踩差数代替赞数", "agree_num", SwitchButtonHolder.TYPE_SWITCH));
         preferenceLayout.addView(TSPreferenceHelper.createButton(TRACE, "希望有一天不再需要贴吧TS", true, v -> {

diff --git a/app/src/main/java/gm/tieba/tabswitch/hooker/deobfuscation/Deobfuscation.java b/app/src/main/java/gm/tieba/tabswitch/hooker/deobfuscation/Deobfuscation.java
@@ -4,8 +4,8 @@
 
 import org.luckypray.dexkit.DexKitBridge;
 import org.luckypray.dexkit.query.FindMethod;
-import org.luckypray.dexkit.query.MethodDataList;
 import org.luckypray.dexkit.query.matchers.MethodMatcher;
+import org.luckypray.dexkit.result.MethodDataList;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/app/src/main/java/gm/tieba/tabswitch/hooker/extra/RedirectImage.java b/app/src/main/java/gm/tieba/tabswitch/hooker/extra/RedirectImage.java
diff --git a/settings.gradle b/settings.gradle
@@ -5,8 +5,8 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'com.android.application' version '8.1.1'
-        id 'com.android.library' version '8.1.1'
+        id 'com.android.application' version '8.1.4'
+        id 'com.android.library' version '8.1.4'
         id 'org.jetbrains.kotlin.android' version '1.9.0'
         id 'com.google.devtools.ksp' version '1.9.0-1.0.13' apply false
     }