From 2693fcd5c5866b27273dbe5022db80b1f7828064 Mon Sep 17 00:00:00 2001
From: HolographicHat <holographichat@outlook.com>
Date: Wed, 23 Nov 2022 12:31:13 +0800
Subject: [PATCH] fix field name

---
 .github/workflows/android.yml                 | 24 ++++++++++++-------
 .../main/java/hat/holo/token/TokenActivity.kt |  3 ++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 27b3af9..7185ab9 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,6 +1,7 @@
 name: Android CI
 
 on:
+  workflow_dispatch:
   push:
     branches: [ "master" ]
   pull_request:
@@ -14,7 +15,8 @@ jobs:
       SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
       SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
     steps:
-    - uses: actions/checkout@v3
+    - name: Checkout repository
+      uses: actions/checkout@v3
     - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
@@ -25,18 +27,22 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle
       run: ./gradlew assembleRelease
-    - run: sudo apt-get install -y jq
+    - name: Install jq
+      run: sudo apt-get install -y jq
     - name: Download package
       run: "curl -H 'x-rpc-client_type: 2' -H 'x-rpc-app_version: 2.37.1' -H 'x-rpc-channel: miyousheluodi' https://api-takumi.mihoyo.com/ptolemaios/api/getLatestRelease | jq --raw-output '.data.package_url' | xargs curl -o origin.apk"
     - name: Patch package
-      run: "java -jar gradle/lspatch/jar-v0.5.1-361-release.jar -f -l 2 -m app/build/outputs/apk/release/app-release.apk -o pout origin.apk"
+      run: "mkdir out && mv app/build/outputs/apk/release/app-release.apk out && java -jar gradle/lspatch/jar-v0.5.1-361-release.jar -f -l 2 -m -o out origin.apk"
     - name: Upload build artifacts
       uses: actions/upload-artifact@v3.1.0
       with:
         name: Artifacts
-        path: app/build/outputs/apk/release/app-release-unsigned.apk
-    - name: Upload patched package
-      uses: actions/upload-artifact@v3.1.0
-      with:
-        name: Artifacts
-        path: pout
+        path: out
+    #- name: Set up Node 16
+    #    uses: actions/setup-node@v3
+    #    with:
+    #      node-version: 16
+    #- name: Install depencies
+    #  run: npm install axios@0.27.2
+    #- name: Run post build script
+    #  run:
diff --git a/app/src/main/java/hat/holo/token/TokenActivity.kt b/app/src/main/java/hat/holo/token/TokenActivity.kt
index 42fef39..6905dfc 100644
--- a/app/src/main/java/hat/holo/token/TokenActivity.kt
+++ b/app/src/main/java/hat/holo/token/TokenActivity.kt
@@ -109,9 +109,10 @@ private fun TokenActivity.Content(accountInfo: AccountInfo) = Column(
                 onClick = {
                     runCatching {
                         val authStr = buildMap {
-                            put("uid", accountInfo.uid)
+                            put("ltuid", accountInfo.uid)
                             put("ltoken", accountInfo.lToken)
                             if (grantSToken) {
+                                put("stuid", accountInfo.uid)
                                 put("mid", accountInfo.mid)
                                 put("stoken", accountInfo.sToken)
                             }