[pull] main from GuhDoy:main

.github/workflows/android.yml

@@ -13,37 +13,50 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
         with:
           submodules: 'recursive'
           fetch-depth: 0
-      - name: Setup JDK 11
-        uses: actions/setup-java@v1
+
+      - name: Setup JDK 17
+        uses: actions/[email protected]
         with:
-          java-version: 11
-      - name: Retrieve version
-        run: |
-          echo VERSION=$(echo ${{ github.event.head_commit.id }} | head -c 10) >> $GITHUB_ENV
+          java-version: 17
+          distribution: 'temurin'
+
       - name: Build with Gradle
-        run: bash ./gradlew -PappVerName=${{ env.VERSION }} assembleRelease
+        run: bash ./gradlew assembleRelease
+
       - name: Sign Android release
         if: success()
         id: sign
         uses: r0adkll/sign-android-release@v1
         env:
-          BUILD_TOOLS_VERSION: "31.0.0"
+          BUILD_TOOLS_VERSION: "33.0.2"
         with:
           releaseDirectory: app/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Retrieve filename
+        if: success()
+        run: echo "FILENAME=$(basename ${{ steps.sign.outputs.signedReleaseFile }})" >> $GITHUB_ENV
+        shell: bash
+
       - name: Upload built apk
         if: success()
-        uses: actions/upload-artifact@v2
+        id: upload
+        uses: actions/upload-artifact@v4
         with:
-          name: TS_${{ env.VERSION }}.apk
+          name: ${{ env.FILENAME }}
           path: ${{ steps.sign.outputs.signedReleaseFile }}
+
+      - name: Write job summary
+        if: success()
+        run: echo "### [下载链接](${{ steps.upload.outputs.artifact-url }})" >> $GITHUB_STEP_SUMMARY
+
       - name: Send commit to telegram
         uses: appleboy/telegram-action@master
         with:
@@ -61,7 +74,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ startsWith(github.event.head_commit.message, '[skip ci]') }}
     steps:
-      - uses: actions/checkout@v2
       - name: Send commit to telegram
         uses: appleboy/telegram-action@master
         with:

app/build.gradle.kts

@@ -0,0 +1,118 @@
+import java.io.ByteArrayOutputStream
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("com.google.devtools.ksp")
+}
+
+fun String.runCommand(currentWorkingDir: File = file("./")): String {
+    val byteOut = ByteArrayOutputStream()
+    project.exec {
+        workingDir = currentWorkingDir
+        commandLine = [email protected]("\\s".toRegex())
+        standardOutput = byteOut
+    }
+    return String(byteOut.toByteArray()).trim()
+}
+
+val gitCommitCount = "git rev-list --count HEAD".runCommand().toInt()
+val latestTag = "git describe --abbrev=0 --tags".runCommand()
+val commitCountSinceLatestTag = ("git rev-list --count $latestTag..HEAD").runCommand()
+val sdk = 34
+
+android {
+    compileSdk = sdk
+    buildToolsVersion = "34.0.0"
+    ndkVersion = "26.0.10792818"
+
+    defaultConfig {
+        applicationId = "gm.tieba.tabswitch"
+        minSdk = 28
+        targetSdk = sdk
+        versionCode = gitCommitCount
+        versionName = "3.0.3-beta"
+        if (versionName!!.contains("alpha") || versionName!!.contains("beta")) {
+            versionNameSuffix = ".$commitCountSinceLatestTag"
+        }
+        buildConfigField("String", "TARGET_VERSION", "\"12.66.1.0\"")
+        buildConfigField("String", "MIN_VERSION", "\"12.53.1.0\"")
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                abiFilters("arm64-v8a")
+                arguments("-DANDROID_STL=none")
+            }
+        }
+    }
+    applicationVariants.all {
+        outputs
+            .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
+            .all { output ->
+                output.outputFileName = "TS_${defaultConfig.versionName}${defaultConfig.versionNameSuffix ?: ""}_${name}.apk"
+                false
+            }
+    }
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    externalNativeBuild {
+        cmake {
+            path("src/main/cpp/CMakeLists.txt")
+        }
+    }
+    packaging {
+        resources.excludes.addAll(listOf("/META-INF/**", "/kotlin/**", "/okhttp3/**"))
+        jniLibs.excludes.addAll(listOf("**/liblog.so", "/lib/x86/**", "/lib/x86_64/**"))
+    }
+    buildFeatures {
+        prefab = true
+        buildConfig = true
+    }
+    lint {
+        checkDependencies = true
+    }
+    namespace = "gm.tieba.tabswitch"
+}
+
+dependencies {
+    compileOnly("de.robv.android.xposed:api:82")
+    api("androidx.annotation:annotation:1.7.1")
+
+    val roomVersion = "2.6.1"
+    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("org.luckypray:dexkit:2.0.1")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("dev.rikka.ndk.thirdparty:cxx:1.2.0")
+}
+
+val adbExecutable: String = androidComponents.sdkComponents.adb.get().asFile.absolutePath
+
+tasks.register("restartTieba") {
+    doLast {
+        exec {
+            commandLine(adbExecutable, "shell", "am", "force-stop", "com.baidu.tieba")
+        }
+        exec {
+            commandLine(adbExecutable, "shell", "am", "start", "$(pm resolve-activity --components com.baidu.tieba)")
+        }
+    }
+}
+
+afterEvaluate {
+    tasks.named("installDebug").configure {
+        finalizedBy(tasks.named("restartTieba"))
+    }
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="gm.tieba.tabswitch">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@mipmap/ic_launcher"
@@ -21,4 +20,4 @@
             android:name="xposedscope"
             android:resource="@array/recommend_package" />
     </application>
-</manifest>
+</manifest>

app/src/main/assets/Purge.js

@@ -0,0 +1,49 @@
+(function (send) {
+  XMLHttpRequest.prototype.send = function () {
+    var callback = this.onreadystatechange;
+    this.onreadystatechange = function () {
+      if (this.readyState == 4) {
+        let propertiesToDelete = [];
+        if (
+          // 吧页面更多板块
+          this.responseURL.match(
+            /https?:\/\/tieba\.baidu\.com\/c\/f\/frs\/frsBottom.*/g
+          )
+        ) {
+          propertiesToDelete = [
+            "frs_bottom",
+            "activityhead",
+            "live_fuse_forum",
+            "card_activity",
+            "ai_chatroom_guide",
+            "friend_forum",
+            "game_card_guide",
+            "area_data",
+          ];
+        } else if (
+          // 一键签到页面
+          this.responseURL.match(
+            /https?:\/\/tieba\.baidu\.com\/c\/f\/forum\/getforumlist.*/g
+          )
+        ) {
+          propertiesToDelete = ["advert"];
+        }
+        if (propertiesToDelete.length > 0) {
+          res = JSON.parse(this.response);
+          propertiesToDelete.forEach((property) => {
+            delete res[property];
+          });
+          Object.defineProperty(this, "response", { writable: true });
+          Object.defineProperty(this, "responseText", {
+            writable: true,
+          });
+          this.response = this.responseText = JSON.stringify(res);
+        }
+      }
+      if (callback) {
+        callback.apply(this, arguments);
+      }
+    };
+    send.apply(this, arguments);
+  };
+})(XMLHttpRequest.prototype.send);

app/src/main/cpp/CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.18.1)
+project(TS)
 set(CMAKE_CXX_STANDARD 20)
 
 set(C_FLAGS "-Werror=format -fdata-sections -ffunction-sections -fno-exceptions -fno-rtti -fno-threadsafe-statics")

app/src/main/java/gm/tieba/tabswitch/Constants.kt

@@ -1,15 +1,17 @@
 package gm.tieba.tabswitch
 
 object Constants {
-    @JvmStatic
     val strings = mapOf(
         "EULA" to "如果您对本协议的任何条款表示异议，您可以选择不使用本模块；使用本模块则意味着您已完全理解和同意遵守本协议。\n\n" +
                 "    ①本模块开源免费，所有版本均为自动构建，可确保构建版本与源代码一致。对本模块的任何异议都必须以源代码为依据。\n" +
                 "    ②本模块不会主动发起网络请求，不会上传任何用户数据，隐私泄露或者账号异常行为与本模块无关。\n" +
                 "    ③本模块主要用于学习和交流技术，任何人不得将本模块用于商业或非法用途。",
         "dev_tip" to "提示：您当前安装的是非正式版本，可能含有较多错误，如果您希望得到更稳定的使用体验，建议您安装正式版本。",
-        "exception_rules_incomplete" to "规则异常，建议您执行反混淆。若执行完后仍出现此对话框则应更新模块，若模块已是最新版本则应向作者反馈。",
-        "exception_init_preference" to "初始化设置失败，请尝试更换百度贴吧版本。",
+        "exception_rules_incomplete" to "请点击确定并重启应用以重新执行反混淆。若执行反混淆后仍出现此对话框则应尝试更新模块或向作者反馈。\n",
+        "version_mismatch" to "当前贴吧版本不受支持。请使用受支持的贴吧版本（%s-%s）或尝试更新模块。\n",
+        "exception_init_preference" to "初始化设置失败，请尝试更换贴吧版本。",
         "regex_hint" to "请输入正则表达式，如.*",
+        "release_uri" to "https://github.com/GuhDoy/TiebaTS/releases",
+        "ci_uri" to "https://github.com/GuhDoy/TiebaTS/actions",
     )
 }