feat: get device info

PaiGramTeam · Oct 1, 2023 · 452240a · 452240a
1 parent 17d23f4
commit 452240a
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 9 deletions.
diff --git a/.github/paigram.jks b/.github/paigram.jks
diff --git a/.github/utils.js b/.github/utils.js
@@ -4,7 +4,7 @@ const axios = require("axios").create({
     maxBodyLength: Infinity
 })
 
-const repo = "HolographicHat/GetToken"
+const repo = "PaiGramTeam/GetToken"
 const token = process.env.GHP_TOKEN
 
 const getAppVersion = async () => {

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -4,8 +4,6 @@ on:
   workflow_dispatch:
   push:
     branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
 
 jobs:
 

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -1,8 +1,7 @@
 name: Update Check
 
 on:
-  schedule:
-    - cron: '0 12 * * *'
+  workflow_dispatch: ~
 
 jobs:
 

diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@
 local.properties
 .idea
 api-82-sources.jar
-restart.cmd
+restart.cmd
+app/release/
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,7 +21,7 @@ android {
 
     signingConfigs {
         release {
-            storeFile file('../.github/signkey.jks')
+            storeFile file('../.github/paigram.jks')
             keyAlias System.getenv("SIGNING_KEY_ALIAS")
             keyPassword System.getenv("SIGNING_KEY_PASSWORD")
             storePassword System.getenv("SIGNING_KEY_PASSWORD")

diff --git a/app/src/main/java/hat/holo/token/LoaderActivity.kt b/app/src/main/java/hat/holo/token/LoaderActivity.kt
@@ -22,6 +22,7 @@ class LoaderActivity : Activity() {
         val zActivity = loader.loadClass("hat.holo.token.TokenActivity")
         val actIntent = Intent(this, zActivity)
         actIntent.putExtra("accountInfo", intent.getSerializableExtra("accountInfo"))
+        actIntent.putExtra("deviceInfo", intent.getSerializableExtra("deviceInfo"))
         startActivityForResult(actIntent, 1234)
     }
 

diff --git a/app/src/main/java/hat/holo/token/ModuleMain.kt b/app/src/main/java/hat/holo/token/ModuleMain.kt
@@ -50,6 +50,7 @@ class ModuleMain : IXposedHookLoadPackage, IXposedHookZygoteInit {
                     AppUtils.init(classLoader)
                     AccountManager.init(classLoader)
                     val app = p.args[0] as Application
+                    DeviceUtils.init(app.applicationContext)
                     appendToClassPath(app.applicationContext)
                 }
             })
@@ -74,11 +75,13 @@ class ModuleMain : IXposedHookLoadPackage, IXposedHookZygoteInit {
                                 val intent = Intent(ctx, LoaderActivity::class.java)
                                 intent.putExtra("accountInfo", AccountManager.accountInfo)
                                 intent.putExtra("dexPath", modulePath)
+                                intent.putExtra("deviceInfo", DeviceUtils.deviceInfo)
                                 ctx.startActivity(intent)
                             } else {
                                 val intent = Intent()
                                 intent.setClassName("hat.holo.token", "hat.holo.token.TokenActivity")
                                 intent.putExtra("accountInfo", AccountManager.accountInfo)
+                                intent.putExtra("deviceInfo", DeviceUtils.deviceInfo)
                                 ctx.startActivity(intent)
                             }
                         } else {

diff --git a/app/src/main/java/hat/holo/token/TokenActivity.kt b/app/src/main/java/hat/holo/token/TokenActivity.kt
@@ -31,6 +31,7 @@ import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.core.content.getSystemService
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import hat.holo.token.models.AccountInfo
+import hat.holo.token.models.DeviceInfo
 import kotlinx.coroutines.delay
 
 val textColor = Color(0xFF424242)
@@ -45,6 +46,7 @@ class TokenActivity : ComponentActivity() {
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         setTheme(androidx.appcompat.R.style.Theme_AppCompat_Light_NoActionBar)
         val accountInfo = intent.getSerializableExtra("accountInfo") as AccountInfo
+        val deviceInfo = intent.getSerializableExtra("deviceInfo") as DeviceInfo
         setContent {
             rememberSystemUiController().setStatusBarColor(Color.White)
             MaterialTheme(
@@ -53,7 +55,7 @@ class TokenActivity : ComponentActivity() {
                 ),
                 content = {
                     Surface {
-                        Content(accountInfo)
+                        Content(accountInfo, deviceInfo)
                     }
                 }
             )
@@ -70,7 +72,7 @@ private fun TokenActivity.showDialog(msg: String) = runOnUiThread {
 }
 
 @Composable
-private fun TokenActivity.Content(accountInfo: AccountInfo) = Column(
+private fun TokenActivity.Content(accountInfo: AccountInfo, deviceInfo: DeviceInfo) = Column(
     modifier = Modifier.fillMaxSize()
 ) {
     TopAppBar()
@@ -79,6 +81,7 @@ private fun TokenActivity.Content(accountInfo: AccountInfo) = Column(
     ) {
         var grantSToken by remember { mutableStateOf(false) }
         var showDoneIcon by remember { mutableStateOf(false) }
+        var getDeviceInfo by remember { mutableStateOf(false) }
         CustomCheckBox(
             checked = true,
             onCheckedChange = {},
@@ -100,6 +103,15 @@ private fun TokenActivity.Content(accountInfo: AccountInfo) = Column(
                 appendLine(" · 其它可以通过米游社APP完成的操作")
             } // TODO: More description
         )
+        CustomCheckBox(
+            checked = getDeviceInfo,
+            onCheckedChange = { v -> getDeviceInfo = v },
+            name = "Device",
+            permissions = buildAnnotatedString {
+                appendLine("此信息可以用于:")
+                appendLine(" · 一定程度下绕过风控")
+            }
+        )
         Divider()
         Row(
             modifier = Modifier.fillMaxWidth(),
@@ -116,6 +128,10 @@ private fun TokenActivity.Content(accountInfo: AccountInfo) = Column(
                                 put("mid", accountInfo.mid)
                                 put("stoken", accountInfo.sToken)
                             }
+                            if (getDeviceInfo) {
+                                put("x-rpc-device_id", deviceInfo.id)
+                                put("x-rpc-device_fp", deviceInfo.fp)
+                            }
                         }.map { (k, v) -> "$k=$v" }.joinToString(";")
                         val clip = ClipData.newPlainText(null, authStr)
                         getSystemService<ClipboardManager>()!!.setPrimaryClip(clip)

diff --git a/app/src/main/java/hat/holo/token/models/DeviceInfo.kt b/app/src/main/java/hat/holo/token/models/DeviceInfo.kt
@@ -0,0 +1,6 @@
+package hat.holo.token.models
+
+data class DeviceInfo(
+    val id: String,
+    val fp: String,
+) : java.io.Serializable
diff --git a/app/src/main/java/hat/holo/token/utils/DeviceUtils.kt b/app/src/main/java/hat/holo/token/utils/DeviceUtils.kt
@@ -0,0 +1,21 @@
+package hat.holo.token.utils
+
+import android.content.Context
+import hat.holo.token.models.DeviceInfo
+
+
+@Suppress("MemberVisibilityCanBePrivate", "unused")
+object DeviceUtils {
+
+    private lateinit var id: String
+    private lateinit var fp: String
+    lateinit var deviceInfo: DeviceInfo
+
+    fun init(ctx: Context) {
+        val preDevice = ctx.getSharedPreferences("pre_device.xml", 0)
+        id = preDevice.getString("device_id", "").toString()
+        val comboDeviceFingerprint = ctx.getSharedPreferences("combo_device_fingerprint", 0)
+        fp = comboDeviceFingerprint.getString("fp", "").toString()
+        deviceInfo = DeviceInfo(id, fp)
+    }
+}