bump version

GuhDoy · Apr 28, 2021 · 8f372ee · 8f372ee
1 parent a0ffb0e
commit 8f372ee
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
 - 浏览历史增加搜索
 - 楼层回复增加查看主题贴
 - 长按下载保存全部图片
-- 长按关注的人设置备注名（仅支持 12.4.8.2 及以前版本）
+- 长按关注的人设置备注名（仅支持 12.4.8.15 及以前版本）
 - 自动签到
 - 更新时清理缓存
 - 自动查看原图
@@ -30,9 +30,13 @@
 - 用赞踩差数代替赞数
 - 交换吧热门与最新
 
+## 项目地址
+
+[https://github.com/GuhDoy/TiebaTS](https://github.com/GuhDoy/TiebaTS)
+
 ## 特别鸣谢
 
-详见[LicenseActivity.java](https://github.com/GuhDoy/TiebaTS/blob/main/app/src/main/java/gm/tieba/tabswitch/ui/LicenseActivity.java)
+详见[LicenseActivity.java](https://github.com/GuhDoy/TiebaTS/blob/full/app/src/main/java/gm/tieba/tabswitch/ui/LicenseActivity.java)
 
 ## 下载
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 30
         versionCode 11
-        versionName "2.5-beta"
+        versionName "2.5"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled false
     }

diff --git a/app/src/main/java/gm/tieba/tabswitch/XposedInit.java b/app/src/main/java/gm/tieba/tabswitch/XposedInit.java
@@ -57,7 +57,6 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     if (!(param.args[0] instanceof Application)) return;
                     Context context = ((Application) param.args[0]).getApplicationContext();
                     Preferences.init(context);
-
                     try {
                         Rule.init(context);
                         List<String> lostList = AntiConfusionHelper.getRulesLost();

diff --git a/app/src/main/java/gm/tieba/tabswitch/hooker/AntiConfusion.java b/app/src/main/java/gm/tieba/tabswitch/hooker/AntiConfusion.java
@@ -1,5 +1,6 @@
 package gm.tieba.tabswitch.hooker;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -45,6 +46,7 @@ public void hook() throws Throwable {
         for (Method method : sClassLoader.loadClass("com.baidu.tieba.LogoActivity").getDeclaredMethods()) {
             if (!method.getName().startsWith("on") && Arrays.toString(method.getParameterTypes()).equals("[class android.os.Bundle]")) {
                 XposedBridge.hookMethod(method, new XC_MethodReplacement() {
+                    @SuppressLint({"ApplySharedPref", "SetTextI18n"})
                     @Override
                     protected Object replaceHookedMethod(MethodHookParam param) throws Throwable {
                         Activity activity = (Activity) param.thisObject;

diff --git a/app/src/main/java/gm/tieba/tabswitch/hooker/PurifyMy.java b/app/src/main/java/gm/tieba/tabswitch/hooker/PurifyMy.java
@@ -73,6 +73,7 @@ protected void afterHookedMethod(XC_MethodHook.MethodHookParam param) throws Thr
                                             field.setAccessible(true);
                                             if (field.get(param.thisObject) instanceof ArrayList) {
                                                 ArrayList<?> arrayList = (ArrayList<?>) field.get(param.thisObject);
+                                                if (arrayList == null) continue;
                                                 for (int i = 0; i < arrayList.size(); i++) {
                                                     try {
                                                         Reflect.getObjectField(arrayList.get(i), "com.baidu.tbadk.core.data.UserData");
@@ -86,11 +87,10 @@ protected void afterHookedMethod(XC_MethodHook.MethodHookParam param) throws Thr
                                                         field2.setAccessible(true);
                                                         if (field2.get(arrayList.get(i)) instanceof String) {
                                                             String type = (String) field2.get(arrayList.get(i));
-                                                            if (type == null) continue;
-                                                            if (!type.startsWith("http") &&
-                                                                    !type.equals("我的收藏") &&
-                                                                    !type.equals("浏览历史") &&
-                                                                    !type.equals("服务中心")) {
+                                                            if (type != null && !type.startsWith("http")
+                                                                    && !type.equals("我的收藏")
+                                                                    && !type.equals("浏览历史")
+                                                                    && !type.equals("服务中心")) {
                                                                 arrayList.remove(i);
                                                                 i--;
                                                             }