From 6720c29c1d341d7246998a786882b240cd172273 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 15:37:15 +0800
Subject: [PATCH 01/44] Create android.yml

---
 .github/workflows/android.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/workflows/android.yml

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 0000000..1b7e7a8
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,32 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew assembleRelease
+    
+    - name: Archive build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+          name: build-artifact
+          path: app/build/

From 941de8c83cf40927cdcfb969ae53e96df47244d3 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 15:37:52 +0800
Subject: [PATCH 02/44] Update android.yml

---
 .github/workflows/android.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 1b7e7a8..5fe808d 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,10 +1,12 @@
 name: Android CI
 
 on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+  workflow_dispatch:
+    inputs:
+      docker_images:
+        description: '请填写docker镜像名称 多个用英文逗号分开'
+        required: true
+        default: 'alpine:latest'  # 设置默认的 Docker 镜像列表
 
 jobs:
   build:

From 51a65a9d8bbc7fb833a05a7812f369588f4e3908 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 16:33:59 +0800
Subject: [PATCH 03/44] Update android.yml

---
 .github/workflows/android.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5fe808d..2cbd05b 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -26,9 +26,22 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle
       run: ./gradlew assembleRelease
-    
+
+    # Step 6: Generate Keystore using keytool
+    - name: Generate Keystore
+      run: |
+          keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 \
+            -alias my-key-alias -storepass android -keypass android \
+            -dname "CN=Example, OU=Dev, O=MyCompany, L=City, ST=State, C=US"
+      
+      # Step 7: Sign APK
+    - name: Sign APK
+      run: |
+          jarsigner -verbose -keystore my-release-key.jks -storepass android -keypass android \
+            app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk my-key-alias
+          zipalign -v 4 app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
     - name: Archive build artifacts
       uses: actions/upload-artifact@v4
       with:
           name: build-artifact
-          path: app/build/
+          path: app/build/outputs/apk/release/app-release.apk

From 352c4f01f5b1fee483302c455320c32083e9a043 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 16:49:26 +0800
Subject: [PATCH 04/44] Update android.yml

---
 .github/workflows/android.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 2cbd05b..3648417 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -27,6 +27,28 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew assembleRelease
 
+    - name: Sign Release
+
+      uses: r0adkll/sign-android-release@v1
+
+      id: sign_app
+
+      with:
+
+          releaseDirectory: app/build/outputs/apk/release
+
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+
+          alias: ${{ secrets.ALIAS }}
+
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+          zipAlign: true
+      env:
+
+          BUILD_TOOLS_VERSION: "34.0.0"  
+
     # Step 6: Generate Keystore using keytool
     - name: Generate Keystore
       run: |

From de7f85d50a622ff3d004ecef1c4d06074ae1aa99 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 17:44:17 +0800
Subject: [PATCH 05/44] Update android.yml

---
 .github/workflows/android.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3648417..5da94a7 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -34,16 +34,6 @@ jobs:
       id: sign_app
 
       with:
-
-          releaseDirectory: app/build/outputs/apk/release
-
-          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-
-          alias: ${{ secrets.ALIAS }}
-
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
           zipAlign: true
       env:
 

From a836fd113af88e6b9cd6f689673064c016df8692 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 17:55:30 +0800
Subject: [PATCH 06/44] Update android.yml

---
 .github/workflows/android.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5da94a7..f76275f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -27,33 +27,35 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew assembleRelease
 
+      
+
+    # Step 6: Generate Keystore using keytool
+    - name: Generate Keystore
+      run: |
+          keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 \
+            -alias my-key-alias -storepass android -keypass android \
+            -dname "CN=Example, OU=Dev, O=MyCompany, L=City, ST=State, C=US"
     - name: Sign Release
 
       uses: r0adkll/sign-android-release@v1
 
       id: sign_app
 
-      with:
-          zipAlign: true
+      
+      
       env:
 
           BUILD_TOOLS_VERSION: "34.0.0"  
-
-    # Step 6: Generate Keystore using keytool
-    - name: Generate Keystore
-      run: |
-          keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 \
-            -alias my-key-alias -storepass android -keypass android \
-            -dname "CN=Example, OU=Dev, O=MyCompany, L=City, ST=State, C=US"
-      
       # Step 7: Sign APK
     - name: Sign APK
       run: |
           jarsigner -verbose -keystore my-release-key.jks -storepass android -keypass android \
             app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk my-key-alias
           zipalign -v 4 app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
-    - name: Archive build artifacts
-      uses: actions/upload-artifact@v4
+          
+    
+      
+    - uses: actions/upload-artifact@v4
       with:
           name: build-artifact
           path: app/build/outputs/apk/release/app-release.apk

From 98e76f19aa374cf375d58f75ed7d6ba364f79718 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:14:14 +0800
Subject: [PATCH 07/44] Update android.yml

---
 .github/workflows/android.yml | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index f76275f..d67e4d7 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -22,6 +22,30 @@ jobs:
         distribution: 'temurin'
         cache: gradle
 
+    - name: Install Android SDK & Build Tools
+      run: |
+          sudo apt-get update
+          sudo apt-get install -y wget unzip
+          # Download command line tools for Android SDK
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
+          unzip commandlinetools-linux-7583922_latest.zip -d cmdline-tools
+          sudo mv cmdline-tools /usr/local/android-sdk
+          sudo mkdir -p /usr/local/android-sdk/cmdline-tools/latest
+          sudo mv /usr/local/android-sdk/cmdline-tools/* /usr/local/android-sdk/cmdline-tools/latest/
+
+          # Set up Android environment variables
+          echo "export ANDROID_SDK_ROOT=/usr/local/android-sdk" >> $GITHUB_ENV
+          echo "export PATH=\$PATH:/usr/local/android-sdk/cmdline-tools/latest/bin" >> $GITHUB_ENV
+
+          # Accept licenses
+          yes | sdkmanager --licenses
+
+          # Install build tools (includes zipalign)
+          sdkmanager "build-tools;30.0.3"
+
+          # Add build tools path to environment
+          echo "export PATH=\$PATH:/usr/local/android-sdk/build-tools/30.0.3" >> $GITHUB_ENV
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
@@ -35,17 +59,7 @@ jobs:
           keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 \
             -alias my-key-alias -storepass android -keypass android \
             -dname "CN=Example, OU=Dev, O=MyCompany, L=City, ST=State, C=US"
-    - name: Sign Release
-
-      uses: r0adkll/sign-android-release@v1
-
-      id: sign_app
-
-      
-      
-      env:
 
-          BUILD_TOOLS_VERSION: "34.0.0"  
       # Step 7: Sign APK
     - name: Sign APK
       run: |

From 79521f1a23d537ffdf57c22acbc211bf6c7aa040 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:25:58 +0800
Subject: [PATCH 08/44] Update android.yml

---
 .github/workflows/android.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d67e4d7..682ce6b 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -26,17 +26,16 @@ jobs:
       run: |
           sudo apt-get update
           sudo apt-get install -y wget unzip
-          # Download command line tools for Android SDK
+    
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
+          
           unzip commandlinetools-linux-7583922_latest.zip -d cmdline-tools
-          sudo mv cmdline-tools /usr/local/android-sdk
-          sudo mkdir -p /usr/local/android-sdk/cmdline-tools/latest
-          sudo mv /usr/local/android-sdk/cmdline-tools/* /usr/local/android-sdk/cmdline-tools/latest/
-
-          # Set up Android environment variables
+          sudo mv cmdline-tools /usr/local/android-sdk   
+          
           echo "export ANDROID_SDK_ROOT=/usr/local/android-sdk" >> $GITHUB_ENV
-          echo "export PATH=\$PATH:/usr/local/android-sdk/cmdline-tools/latest/bin" >> $GITHUB_ENV
-
+          echo "export PATH=\$PATH:/usr/local/android-sdk/cmdline-tools/bin" >> $GITHUB_ENV
+          
+ 
           # Accept licenses
           yes | sdkmanager --licenses
 

From 0e486c408e32b8dba815802aba475990ded71aef Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:32:59 +0800
Subject: [PATCH 09/44] Update android.yml

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 682ce6b..78a4b23 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -33,7 +33,7 @@ jobs:
           sudo mv cmdline-tools /usr/local/android-sdk   
           
           echo "export ANDROID_SDK_ROOT=/usr/local/android-sdk" >> $GITHUB_ENV
-          echo "export PATH=\$PATH:/usr/local/android-sdk/cmdline-tools/bin" >> $GITHUB_ENV
+          echo "export PATH=$PATH:/usr/local/android-sdk/cmdline-tools/bin" >> $GITHUB_ENV
           
  
           # Accept licenses

From 4bef7ddf002f59f4b7c76ce8e9c37db32a47b161 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:03:52 +0800
Subject: [PATCH 10/44] Update android.yml

---
 .github/workflows/android.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 78a4b23..0fed653 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -37,13 +37,13 @@ jobs:
           
  
           # Accept licenses
-          yes | sdkmanager --licenses
+          yes | /usr/local/android-sdk/cmdline-tools/bin/sdkmanager --licenses
 
           # Install build tools (includes zipalign)
-          sdkmanager "build-tools;30.0.3"
+          /usr/local/android-sdk/cmdline-tools/bin/sdkmanager/sdkmanager "build-tools;30.0.3"
 
           # Add build tools path to environment
-          echo "export PATH=\$PATH:/usr/local/android-sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "export PATH=$PATH:/usr/local/android-sdk/build-tools/30.0.3" >> $GITHUB_ENV
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

From 78603ef590ee7d806c7188f01c218d41603a55a2 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:12:14 +0800
Subject: [PATCH 11/44] Update android.yml

---
 .github/workflows/android.yml | 72 +++++++++++++++++------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0fed653..63b3de2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,61 +14,59 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: gradle
+      - name: Checkout code
+        uses: actions/checkout@v4
+    # Set Current Date As Env Variable
+      - name: Set current date as env variable
+        run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
-    - name: Install Android SDK & Build Tools
-      run: |
-          sudo apt-get update
-          sudo apt-get install -y wget unzip
-    
-          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
-          
-          unzip commandlinetools-linux-7583922_latest.zip -d cmdline-tools
-          sudo mv cmdline-tools /usr/local/android-sdk   
-          
-          echo "export ANDROID_SDK_ROOT=/usr/local/android-sdk" >> $GITHUB_ENV
-          echo "export PATH=$PATH:/usr/local/android-sdk/cmdline-tools/bin" >> $GITHUB_ENV
-          
- 
-          # Accept licenses
-          yes | /usr/local/android-sdk/cmdline-tools/bin/sdkmanager --licenses
+      # Set Repository Name As Env Variable
+      - name: Set repository name as env variable
+        run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
 
-          # Install build tools (includes zipalign)
-          /usr/local/android-sdk/cmdline-tools/bin/sdkmanager/sdkmanager "build-tools;30.0.3"
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
 
-          # Add build tools path to environment
-          echo "export PATH=$PATH:/usr/local/android-sdk/build-tools/30.0.3" >> $GITHUB_ENV
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r26d
+          link-to-sdk: true
 
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew assembleRelease
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew assembleRelease
 
       
 
     # Step 6: Generate Keystore using keytool
-    - name: Generate Keystore
-      run: |
+      - name: Generate Keystore
+        run: |
           keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 \
             -alias my-key-alias -storepass android -keypass android \
             -dname "CN=Example, OU=Dev, O=MyCompany, L=City, ST=State, C=US"
 
       # Step 7: Sign APK
-    - name: Sign APK
-      run: |
+      - name: Sign APK
+        run: |
           jarsigner -verbose -keystore my-release-key.jks -storepass android -keypass android \
             app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk my-key-alias
           zipalign -v 4 app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
           
     
       
-    - uses: actions/upload-artifact@v4
-      with:
+      - uses: actions/upload-artifact@v4
+        with:
           name: build-artifact
           path: app/build/outputs/apk/release/app-release.apk

From 9cffd97eaf4c556d0ffdb735d430874602de5a34 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 20:36:02 +0800
Subject: [PATCH 12/44] Update android.yml

---
 .github/workflows/android.yml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 63b3de2..e00f401 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -49,20 +49,29 @@ jobs:
         run: ./gradlew assembleRelease
 
       
-
+      - uses: ilharp/sign-android-release@v1 # Or use @nightly
+        name: Sign app APK
+        id: sign_app
+        with:
+          releaseDir: app/build/outputs/apk/release
+          signingKey: ${{ secrets.ANDROID_SIGNING_KEY }}
+          keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
+          buildToolsVersion: 33.0.0
     # Step 6: Generate Keystore using keytool
-      - name: Generate Keystore
-        run: |
-          keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 \
-            -alias my-key-alias -storepass android -keypass android \
-            -dname "CN=Example, OU=Dev, O=MyCompany, L=City, ST=State, C=US"
+ #     - name: Generate Keystore
+ #       run: |
+   #       keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 \
+  #          -alias my-key-alias -storepass android -keypass android \
+#            -dname "CN=Example, OU=Dev, O=MyCompany, L=City, ST=State, C=US"
 
       # Step 7: Sign APK
-      - name: Sign APK
-        run: |
-          jarsigner -verbose -keystore my-release-key.jks -storepass android -keypass android \
-            app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk my-key-alias
-          zipalign -v 4 app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
+    #  - name: Sign APK
+    #    run: |
+    #      jarsigner -verbose -keystore my-release-key.jks -storepass android -keypass android \
+   #         app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk my-key-alias
+    #      zipalign -v 4 app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
           
     
       

From 66202826dc9f0ba5e283f1944f0d0d7fce499f9d Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:17:47 +0800
Subject: [PATCH 13/44] Update android.yml

---
 .github/workflows/android.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index e00f401..6de3ad9 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -49,16 +49,21 @@ jobs:
         run: ./gradlew assembleRelease
 
       
-      - uses: ilharp/sign-android-release@v1 # Or use @nightly
-        name: Sign app APK
-        id: sign_app
+      # Generate signing key using keytool
+      - name: Generate signing key
+        run: |
+          keytool -genkey -v -keystore my-release-key.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias my-key-alias \
+          -storepass "123456" -keypass "123456" -dname "CN=Your Name, OU=Your Org, O=Your Org, L=Your City, S=Your State, C=Your Country"
+
+      # Sign APK using ilharp/sign-android-release@v1
+      - name: Sign APK
+        uses: ilharp/sign-android-release@v1
         with:
-          releaseDir: app/build/outputs/apk/release
-          signingKey: ${{ secrets.ANDROID_SIGNING_KEY }}
-          keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
-          keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
-          buildToolsVersion: 33.0.0
+          releaseDirectory: app/build/outputs/apk/release
+          signingKeyBase64: ${{ steps.keytool.outputs.key }} # Replace with the actual base64-encoded keystore
+          alias: my-key-alias
+          keyStorePassword: "123456"
+          keyPassword: "123456"
     # Step 6: Generate Keystore using keytool
  #     - name: Generate Keystore
  #       run: |

From 41d3e3cd06966dd9066387f7bfa1aeced5f6a210 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:24:11 +0800
Subject: [PATCH 14/44] Update android.yml

---
 .github/workflows/android.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6de3ad9..487856b 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -59,11 +59,12 @@ jobs:
       - name: Sign APK
         uses: ilharp/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/apk/release
-          signingKeyBase64: ${{ steps.keytool.outputs.key }} # Replace with the actual base64-encoded keystore
-          alias: my-key-alias
+          releaseDir: app/build/outputs/apk/release
+          signingKey: ${{ steps.keytool.outputs.key }} # Replace with the actual base64-encoded keystore
+          keyAlias: my-key-alias
           keyStorePassword: "123456"
           keyPassword: "123456"
+          buildToolsVersion: 33.0.0
     # Step 6: Generate Keystore using keytool
  #     - name: Generate Keystore
  #       run: |

From 8ccebc799a1043d5e42bace80f6e9e5054658613 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:34:17 +0800
Subject: [PATCH 15/44] Update android.yml

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 487856b..4d8f7fb 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -60,7 +60,7 @@ jobs:
         uses: ilharp/sign-android-release@v1
         with:
           releaseDir: app/build/outputs/apk/release
-          signingKey: ${{ steps.keytool.outputs.key }} # Replace with the actual base64-encoded keystore
+          signingKey: $(cat my-release-key.keystore | base64) # Replace with the actual base64-encoded keystore
           keyAlias: my-key-alias
           keyStorePassword: "123456"
           keyPassword: "123456"

From 629111ec23fc4db0bb44ea4eb926cd4d9f131e0a Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:54:58 +0800
Subject: [PATCH 16/44] Update android.yml

---
 .github/workflows/android.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 4d8f7fb..79a4b30 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -50,17 +50,19 @@ jobs:
 
       
       # Generate signing key using keytool
-      - name: Generate signing key
+      - name: Encode signing key with openssl
         run: |
-          keytool -genkey -v -keystore my-release-key.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias my-key-alias \
-          -storepass "123456" -keypass "123456" -dname "CN=Your Name, OU=Your Org, O=Your Org, L=Your City, S=Your State, C=Your Country"
+         openssl base64 < path/to/your/some_signing_key.jks | tr -d '\n' | tee some_signing_key.jks.base64.txt
 
+      - name: Decode the base64 signing key
+        run: |
+         cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK
         uses: ilharp/sign-android-release@v1
         with:
           releaseDir: app/build/outputs/apk/release
-          signingKey: $(cat my-release-key.keystore | base64) # Replace with the actual base64-encoded keystore
+          signingKey: $(cat release.keystore | base64 | tr -d '\n') # Replace with the actual base64-encoded keystore
           keyAlias: my-key-alias
           keyStorePassword: "123456"
           keyPassword: "123456"

From c26037c5f0859b2331a8e0b3acdc2461146c34c4 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:07:05 +0800
Subject: [PATCH 17/44] Update android.yml

---
 .github/workflows/android.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 79a4b30..5759915 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -57,6 +57,7 @@ jobs:
       - name: Decode the base64 signing key
         run: |
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
+         cat release.keystore | base64 | tr -d '\n'
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK
         uses: ilharp/sign-android-release@v1

From 3f5d5463b877c6c3ea176188eb8b0b405aa5af81 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:23:02 +0800
Subject: [PATCH 18/44] Update android.yml

---
 .github/workflows/android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5759915..1cd04f5 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -57,13 +57,13 @@ jobs:
       - name: Decode the base64 signing key
         run: |
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
-         cat release.keystore | base64 | tr -d '\n'
+         cat release.keystore
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK
         uses: ilharp/sign-android-release@v1
         with:
           releaseDir: app/build/outputs/apk/release
-          signingKey: $(cat release.keystore | base64 | tr -d '\n') # Replace with the actual base64-encoded keystore
+          signingKey: $(cat release.keystore) # Replace with the actual base64-encoded keystore
           keyAlias: my-key-alias
           keyStorePassword: "123456"
           keyPassword: "123456"

From 4390fe9e803ae88c53342d28264d5c7da1ed5855 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:40:29 +0800
Subject: [PATCH 19/44] Update android.yml

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 1cd04f5..a670074 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Decode the base64 signing key
         run: |
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
-         cat release.keystore
+         echo "$(<release.keystore)" 
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK
         uses: ilharp/sign-android-release@v1

From 54392f00637fbeef470e8ac382615426181c3cc5 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:07:35 +0800
Subject: [PATCH 20/44] Update android.yml

---
 .github/workflows/android.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index a670074..902713d 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -57,7 +57,13 @@ jobs:
       - name: Decode the base64 signing key
         run: |
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
-         echo "$(<release.keystore)" 
+         
+      - name: Get key
+        id: vars
+        run: echo "key=$(cat release.keystore)" >> $GITHUB_OUTPUT
+      - name: Test output
+        run: echo ${{ steps.vars.outputs.key }}
+        
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK
         uses: ilharp/sign-android-release@v1

From 34b84439211ac4ff80e3542637afaebde379b066 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:13:41 +0800
Subject: [PATCH 21/44] Update android.yml

---
 .github/workflows/android.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 902713d..40f40a4 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -57,6 +57,7 @@ jobs:
       - name: Decode the base64 signing key
         run: |
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
+         ls
          
       - name: Get key
         id: vars

From 21b75580245ce20de394cdff361af03f35e36412 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:22:46 +0800
Subject: [PATCH 22/44] Update android.yml

---
 .github/workflows/android.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 40f40a4..75d6e07 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -59,11 +59,14 @@ jobs:
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
          ls
          
-      - name: Get key
-        id: vars
-        run: echo "key=$(cat release.keystore)" >> $GITHUB_OUTPUT
-      - name: Test output
-        run: echo ${{ steps.vars.outputs.key }}
+      - name: Read file contents
+        id: read_file
+        uses: andstor/file-reader-action@v1
+        with:
+          path: "release.keystore"
+
+      - name: File contents
+        run: echo "${ steps.read_file.outputs.contents }"
         
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK

From 4a46a2155b2e6115e4773a831406b026ba2af3c6 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:38:08 +0800
Subject: [PATCH 23/44] Update android.yml

---
 .github/workflows/android.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 75d6e07..16ece8a 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -59,14 +59,14 @@ jobs:
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
          ls
          
-      - name: Read file contents
-        id: read_file
-        uses: andstor/file-reader-action@v1
+      - name: Read README.md
+        id: package
+        uses: jaywcjlove/github-action-read-file@main
         with:
-          path: "release.keystore"
+         path: release.keystore
 
-      - name: File contents
-        run: echo "${ steps.read_file.outputs.contents }"
+      - name: Echo release.keystore
+        run: echo "${{ steps.package.outputs.content }}"
         
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK

From 518f182a1262e7d4ae697b5faaeae32324ec4e18 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:47:38 +0800
Subject: [PATCH 24/44] Update android.yml

---
 .github/workflows/android.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 16ece8a..180e243 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -58,7 +58,11 @@ jobs:
         run: |
          cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
          ls
-         
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-artifact
+          path: release.keystore  
+          
       - name: Read README.md
         id: package
         uses: jaywcjlove/github-action-read-file@main

From 59fa2fbc890b2dff9ba9ae16bbb1726fef8cef6c Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:59:07 +0800
Subject: [PATCH 25/44] Update android.yml

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 180e243..297dd53 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: build-artifact
-          path: release.keystore  
+          path: some_signing_key.jks.base64.txt  
           
       - name: Read README.md
         id: package

From 6e2bfdb8edae6da8bfe471d1b367a27ecac4f429 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 02:24:16 +0800
Subject: [PATCH 26/44] Create gen_key.sh

---
 gen_key.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 gen_key.sh

diff --git a/gen_key.sh b/gen_key.sh
new file mode 100644
index 0000000..34243df
--- /dev/null
+++ b/gen_key.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Andre Ferreira <andre.dev.linux@gmail.com>
+#
+
+# Set environment variables
+set -u
+export JKS_CN="MC-OAuthServer"
+export JKS_OU="Authorization Server"
+export JKS_O="Multicode"
+export JKS_L="GO"
+export JKS_ST="Goiania"
+export JKS_C="BR"
+
+export KEYSTORE_ALIAS="mc-oauth-server"
+export KEYSTORE_FILE_PATH="./${KEYSTORE_ALIAS}.jks"
+export KEYSTORE_PASSWORD=$(openssl rand -base64 30)
+
+# Display Key pass to get and add in application.yaml
+echo ""
+echo "Key Pass: ${KEYSTORE_PASSWORD}"
+echo ""
+
+# Generate KeyPair storage type JKS
+keytool -genkeypair \
+  -alias $KEYSTORE_ALIAS \
+  -storetype JKS \
+  -keyalg RSA \
+  -sigalg SHA256withRSA \
+  -keysize 2048 \
+  -validity 3650 \
+  -dname "CN=${JKS_CN}, OU=${JKS_OU}, O=${JKS_O}, L=${JKS_L}, ST=${JKS_ST}, C=${JKS_C}" \
+  -storepass $KEYSTORE_PASSWORD \
+  -keypass $KEYSTORE_PASSWORD \
+  -keystore $KEYSTORE_FILE_PATH
+
+# Get base64 of keystore file
+base64 -i $KEYSTORE_FILE_PATH -w 0
+
+# Remove key store file
+if [ -f "${KEYSTORE_FILE_PATH}" ]; then
+  rm -f $KEYSTORE_FILE_PATH
+fi
+
+# Unset environment variables
+set +u
+unset KEYSTORE_ALIAS
+unset KEYSTORE_PASSWORD
+unset KEYSTORE_FILE_PATH

From 68ecbb702193ba7c41a37400be51566e0e6fda50 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 13:47:22 +0000
Subject: [PATCH 27/44] e

---
 .github/workflows/android.yml |  42 ++++++++++++++--------------------
 gen_key.sh                    |   8 +++++--
 mc-oauth-server.jks           | Bin 0 -> 2277 bytes
 3 files changed, 23 insertions(+), 27 deletions(-)
 create mode 100644 mc-oauth-server.jks

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 297dd53..5c560af 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -48,37 +48,29 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew assembleRelease
 
-      
-      # Generate signing key using keytool
-      - name: Encode signing key with openssl
-        run: |
-         openssl base64 < path/to/your/some_signing_key.jks | tr -d '\n' | tee some_signing_key.jks.base64.txt
-
-      - name: Decode the base64 signing key
+      - name: gener key
+        id: skey
         run: |
-         cat some_signing_key.jks.base64.txt | base64 -d > release.keystore
-         ls
-      - uses: actions/upload-artifact@v4
-        with:
-          name: build-artifact
-          path: some_signing_key.jks.base64.txt  
-          
-      - name: Read README.md
-        id: package
-        uses: jaywcjlove/github-action-read-file@main
-        with:
-         path: release.keystore
-
-      - name: Echo release.keystore
-        run: echo "${{ steps.package.outputs.content }}"
-        
+          keytool -genkeypair \
+            -alias alias \
+            -storetype JKS \
+            -keyalg RSA \
+            -sigalg SHA256withRSA \
+            -keysize 2048 \
+            -validity 3650 \
+            -dname "CN=cv, OU=jk, O=mul, L=go, ST=goiania, C=br" \
+            -storepass "123456" \
+            -keypass "123456" \
+            -keystore df.jks
+          base64 -i df.jks -w 0 >> "$GITHUB_OUTPUT"
+      
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK
         uses: ilharp/sign-android-release@v1
         with:
           releaseDir: app/build/outputs/apk/release
-          signingKey: $(cat release.keystore) # Replace with the actual base64-encoded keystore
-          keyAlias: my-key-alias
+          signingKey: ${{ steps.skey.outputs }} # Replace with the actual base64-encoded keystore
+          keyAlias: alias
           keyStorePassword: "123456"
           keyPassword: "123456"
           buildToolsVersion: 33.0.0
diff --git a/gen_key.sh b/gen_key.sh
index 34243df..bfc2231 100644
--- a/gen_key.sh
+++ b/gen_key.sh
@@ -35,9 +35,13 @@ keytool -genkeypair \
   -keystore $KEYSTORE_FILE_PATH
 
 # Get base64 of keystore file
-base64 -i $KEYSTORE_FILE_PATH -w 0
-
+#base64 -i $KEYSTORE_FILE_PATH -w 0
+export $SIGNINGKEY=$(base64 "${KEYSTORE_FILE_PATH}" | tr -d '\n')
 # Remove key store file
+echo ""
+echo "SIGNING Key: ${SIGNINGKEY}"
+echo ""
+echo 
 if [ -f "${KEYSTORE_FILE_PATH}" ]; then
   rm -f $KEYSTORE_FILE_PATH
 fi
diff --git a/mc-oauth-server.jks b/mc-oauth-server.jks
new file mode 100644
index 0000000000000000000000000000000000000000..f19e78a47a79f23843d74dc7b1d51c82fa9ccc0a
GIT binary patch
literal 2277
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

literal 0
HcmV?d00001


From 416df9e6bae8f330b1e42734c24a4aad3f264261 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 15:39:50 +0000
Subject: [PATCH 28/44] w

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5c560af..b464200 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -62,7 +62,7 @@ jobs:
             -storepass "123456" \
             -keypass "123456" \
             -keystore df.jks
-          base64 -i df.jks -w 0 >> "$GITHUB_OUTPUT"
+          $(base64 -i df.jks -w 0) >> "$GITHUB_OUTPUT"
       
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK

From caa431c81a8dd03ec43cb90652efe9ce0df7ee8d Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 15:47:08 +0000
Subject: [PATCH 29/44] e

---
 .github/workflows/android.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index b464200..ba31cab 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -62,7 +62,8 @@ jobs:
             -storepass "123456" \
             -keypass "123456" \
             -keystore df.jks
-          $(base64 -i df.jks -w 0) >> "$GITHUB_OUTPUT"
+          echo "encoded_key=$(base64 df.jks | tr -d '\n')" >> "$GITHUB_OUTPUT"
+         # $(base64 -i df.jks -w 0) >> "$GITHUB_OUTPUT"
       
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK

From 0b054d5e9f1e53bc780cb95bb48235feffbd4638 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 15:54:44 +0000
Subject: [PATCH 30/44] e

---
 .github/workflows/android.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ba31cab..6254585 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -62,15 +62,14 @@ jobs:
             -storepass "123456" \
             -keypass "123456" \
             -keystore df.jks
-          echo "encoded_key=$(base64 df.jks | tr -d '\n')" >> "$GITHUB_OUTPUT"
-         # $(base64 -i df.jks -w 0) >> "$GITHUB_OUTPUT"
-      
+          echo "encoded_key=$(base64 df.jks | tr -d '\n')" >> "$GITHUB_OUTPUT
+
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK
         uses: ilharp/sign-android-release@v1
         with:
           releaseDir: app/build/outputs/apk/release
-          signingKey: ${{ steps.skey.outputs }} # Replace with the actual base64-encoded keystore
+          signingKey: ${{ steps.skey.outputs.encoded_key }} # Replace with the actual base64-encoded keystore
           keyAlias: alias
           keyStorePassword: "123456"
           keyPassword: "123456"

From fbc8e1edb7f6e54d1e09879b97250ecb2d5b67fc Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:00:03 +0000
Subject: [PATCH 31/44] e

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6254585..7d773d1 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -62,7 +62,7 @@ jobs:
             -storepass "123456" \
             -keypass "123456" \
             -keystore df.jks
-          echo "encoded_key=$(base64 df.jks | tr -d '\n')" >> "$GITHUB_OUTPUT
+          echo "encoded_key=$(base64 df.jks | tr -d '\n')" >> "$GITHUB_OUTPUT"
 
       # Sign APK using ilharp/sign-android-release@v1
       - name: Sign APK

From dbd5fe3fd2b2624b71d94ea5e98a784857a8548d Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:12:17 +0000
Subject: [PATCH 32/44] e

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 7d773d1..04de7f7 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -93,4 +93,4 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: build-artifact
-          path: app/build/outputs/apk/release/app-release.apk
+          path: app/build/outputs/apk/release

From 5ff6fbddc3898edd0b843c90954af87748241557 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 07:52:00 +0000
Subject: [PATCH 33/44] e

---
 .github/workflows/android.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 04de7f7..bb84c54 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -46,7 +46,13 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew assembleRelease
+        run: |
+          ./gradlew assembleRelease
+          sudo mkdir app/build/outputs/apk/release/si
+          sudo cp app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/si
+
+
+
 
       - name: gener key
         id: skey
@@ -68,7 +74,7 @@ jobs:
       - name: Sign APK
         uses: ilharp/sign-android-release@v1
         with:
-          releaseDir: app/build/outputs/apk/release
+          releaseDir: app/build/outputs/apk/release/si
           signingKey: ${{ steps.skey.outputs.encoded_key }} # Replace with the actual base64-encoded keystore
           keyAlias: alias
           keyStorePassword: "123456"
@@ -93,4 +99,4 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: build-artifact
-          path: app/build/outputs/apk/release
+          path: app/build/outputs/apk/release/si/app-arm64-v8a-release-unsigned-signed.apk

From bce7238df799dfa465cca1bb19394fe79d2e8aae Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:03:31 +0000
Subject: [PATCH 34/44] e

---
 .github/workflows/android.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index bb84c54..175ab5b 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -50,6 +50,7 @@ jobs:
           ./gradlew assembleRelease
           sudo mkdir app/build/outputs/apk/release/si
           sudo cp app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/si
+          sudo chmod +x app/build/outputs/apk/release/si
 
 
 

From 9f4cbf226368f187026579b346b438e9573090a9 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:21:30 +0000
Subject: [PATCH 35/44] e

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 175ab5b..53f599f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -50,7 +50,7 @@ jobs:
           ./gradlew assembleRelease
           sudo mkdir app/build/outputs/apk/release/si
           sudo cp app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk app/build/outputs/apk/release/si
-          sudo chmod +x app/build/outputs/apk/release/si
+          sudo chmod 777 app/build/outputs/apk/release/si
 
 
 

From 88570f4c4b3bb827bb1a501c6af32ad40918d249 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 09:26:10 +0000
Subject: [PATCH 36/44] r

---
 lib/src/main/java/com/artifex/mupdf/viewer/PageView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java b/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java
index bc1113b..5bd8587 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java
@@ -3,6 +3,7 @@
 import com.artifex.mupdf.fitz.Cookie;
 import com.artifex.mupdf.fitz.Link;
 import com.artifex.mupdf.fitz.Quad;
+import com.artifex.mupdf.fitz.StructuredText;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -65,7 +66,7 @@ public class PageView extends ViewGroup {
 	private static final int PROGRESS_DIALOG_DELAY = 200;
 
 	protected final Context mContext;
-
+    private       StructuredText mST;
 	protected     int       mPageNumber;
 	private       Point     mParentSize;
 	protected     Point     mSize;   // Size of page at minimum zoom
@@ -227,7 +228,7 @@ public void setPage(int page, PointF size) {
 			mDrawEntire.cancel();
 			mDrawEntire = null;
 		}
-
+        
 		mIsBlank = false;
 		// Highlights may be missing because mIsBlank was true on last draw
 		if (mSearchView != null)

From f467a620b5d234a956b40e71d57d8625103553b3 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:12:50 +0000
Subject: [PATCH 37/44] e

---
 .../java/com/artifex/mupdf/viewer/PageView.java |  2 --
 .../com/artifex/mupdf/viewer/ReaderView.java    | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java b/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java
index 5bd8587..25ccce1 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/PageView.java
@@ -3,7 +3,6 @@
 import com.artifex.mupdf.fitz.Cookie;
 import com.artifex.mupdf.fitz.Link;
 import com.artifex.mupdf.fitz.Quad;
-import com.artifex.mupdf.fitz.StructuredText;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -66,7 +65,6 @@ public class PageView extends ViewGroup {
 	private static final int PROGRESS_DIALOG_DELAY = 200;
 
 	protected final Context mContext;
-    private       StructuredText mST;
 	protected     int       mPageNumber;
 	private       Point     mParentSize;
 	protected     Point     mSize;   // Size of page at minimum zoom
diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index e6cd333..bb2ff17 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -1,6 +1,7 @@
 package com.artifex.mupdf.viewer;
 
 import com.artifex.mupdf.fitz.Link;
+import com.artifex.mupdf.fitz.StructuredText;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
@@ -66,7 +67,7 @@ public class ReaderView
 	private int               mScrollerLastY;
 	private float		  mLastScaleFocusX;
 	private float		  mLastScaleFocusY;
-
+    private       StructuredText mST = new StructuredText();
 	protected Stack<Integer> mHistory;
 
 	static abstract class ViewMapper {
@@ -906,7 +907,15 @@ public void setLinksEnabled(boolean b) {
 		resetupChildren();
 		invalidate();
 	}
-
+    public int snapword(float x, float y) {
+		Point tmp1 = new Point();
+		tmp1.x = x;
+		tmp1.y = y;
+		Point tmp2 = new Point();
+		tmp2.x = x + 50;
+	    tmp2.y = y + 50;
+        return mST.snapSelection(tmp1, tmp2, mST.FZ_SELECT_WORDS);
+	}
 	public boolean onSingleTapUp(MotionEvent e) {
 		Link link = null;
 		if (!tapDisabled) {
@@ -918,6 +927,7 @@ public boolean onSingleTapUp(MotionEvent e) {
 					setDisplayedViewIndex(page);
 				} else {
 					onTapMainDocArea();
+					snapword(e.getX(), e.getY());
 				}
 			} else if (e.getX() < tapPageMargin) {
 				smartMoveBackwards();
@@ -929,11 +939,12 @@ public boolean onSingleTapUp(MotionEvent e) {
 				smartMoveForwards();
 			} else {
 				onTapMainDocArea();
+				snapword(e.getX(), e.getY());
 			}
 		}
 		return true;
 	}
-
+    
 	protected void onChildSetup(int i, View v) {
 		if (SearchTaskResult.get() != null
 				&& SearchTaskResult.get().pageNumber == i)

From c5359c2577df2e2052f00b28f885e87da2479164 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:31:17 +0000
Subject: [PATCH 38/44] e

---
 lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index bb2ff17..30d110c 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -67,7 +67,7 @@ public class ReaderView
 	private int               mScrollerLastY;
 	private float		  mLastScaleFocusX;
 	private float		  mLastScaleFocusY;
-    private       StructuredText mST = new StructuredText();
+    private       StructuredText mST = new StructuredText(this);
 	protected Stack<Integer> mHistory;
 
 	static abstract class ViewMapper {

From 1b49d98d3f8493873ac7044fbf840d157f23d29f Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:11:28 +0000
Subject: [PATCH 39/44] e

---
 lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index 30d110c..abf84f0 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -67,7 +67,7 @@ public class ReaderView
 	private int               mScrollerLastY;
 	private float		  mLastScaleFocusX;
 	private float		  mLastScaleFocusY;
-    private       StructuredText mST = new StructuredText(this);
+    private       StructuredText mST = new StructuredText(123);
 	protected Stack<Integer> mHistory;
 
 	static abstract class ViewMapper {
@@ -907,7 +907,7 @@ public void setLinksEnabled(boolean b) {
 		resetupChildren();
 		invalidate();
 	}
-    public int snapword(float x, float y) {
+    public int snapword(int x, int y) {
 		Point tmp1 = new Point();
 		tmp1.x = x;
 		tmp1.y = y;

From 5925fdfcf464d17227dfb6ff2cbbc2f5b7403856 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:23:39 +0000
Subject: [PATCH 40/44] e

---
 .../java/com/artifex/mupdf/viewer/ReaderView.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index abf84f0..7de3b9f 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -2,6 +2,7 @@
 
 import com.artifex.mupdf.fitz.Link;
 import com.artifex.mupdf.fitz.StructuredText;
+import com.artifex.mupdf.fitz.Point;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
@@ -67,7 +68,7 @@ public class ReaderView
 	private int               mScrollerLastY;
 	private float		  mLastScaleFocusX;
 	private float		  mLastScaleFocusY;
-    private       StructuredText mST = new StructuredText(123);
+    public       StructuredText mST = new StructuredText(123);
 	protected Stack<Integer> mHistory;
 
 	static abstract class ViewMapper {
@@ -907,13 +908,13 @@ public void setLinksEnabled(boolean b) {
 		resetupChildren();
 		invalidate();
 	}
-    public int snapword(int x, int y) {
-		Point tmp1 = new Point();
+    public int snapword(float x, float y) {
+		com.artifex.mupdf.fitz.Point tmp1 = new com.artifex.mupdf.fitz.Point();
 		tmp1.x = x;
 		tmp1.y = y;
 		Point tmp2 = new Point();
-		tmp2.x = x + 50;
-	    tmp2.y = y + 50;
+		tmp2.x = x + (float)50;
+	    tmp2.y = y + (float)50;
         return mST.snapSelection(tmp1, tmp2, mST.FZ_SELECT_WORDS);
 	}
 	public boolean onSingleTapUp(MotionEvent e) {

From 0ff959e7ea1f5125d6015fcd2f5f41b57c73d01f Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:31:22 +0000
Subject: [PATCH 41/44] e

---
 lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index 7de3b9f..7690537 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -2,7 +2,7 @@
 
 import com.artifex.mupdf.fitz.Link;
 import com.artifex.mupdf.fitz.StructuredText;
-import com.artifex.mupdf.fitz.Point;
+//import com.artifex.mupdf.fitz.Point;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
@@ -68,7 +68,7 @@ public class ReaderView
 	private int               mScrollerLastY;
 	private float		  mLastScaleFocusX;
 	private float		  mLastScaleFocusY;
-    public       StructuredText mST = new StructuredText(123);
+   // public       StructuredText mST = new StructuredText(123);
 	protected Stack<Integer> mHistory;
 
 	static abstract class ViewMapper {
@@ -915,7 +915,7 @@ public int snapword(float x, float y) {
 		Point tmp2 = new Point();
 		tmp2.x = x + (float)50;
 	    tmp2.y = y + (float)50;
-        return mST.snapSelection(tmp1, tmp2, mST.FZ_SELECT_WORDS);
+        return StructuredText.napSelection(tmp1, tmp2, mST.FZ_SELECT_WORDS);
 	}
 	public boolean onSingleTapUp(MotionEvent e) {
 		Link link = null;

From a6dd710df8bb3d3a33bca2a3ee554be30dfc81f3 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:39:34 +0000
Subject: [PATCH 42/44] e

---
 .../java/com/artifex/mupdf/viewer/ReaderView.java    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index 7690537..8b73a56 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -2,7 +2,7 @@
 
 import com.artifex.mupdf.fitz.Link;
 import com.artifex.mupdf.fitz.StructuredText;
-//import com.artifex.mupdf.fitz.Point;
+import com.artifex.mupdf.fitz;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
@@ -909,13 +909,9 @@ public void setLinksEnabled(boolean b) {
 		invalidate();
 	}
     public int snapword(float x, float y) {
-		com.artifex.mupdf.fitz.Point tmp1 = new com.artifex.mupdf.fitz.Point();
-		tmp1.x = x;
-		tmp1.y = y;
-		Point tmp2 = new Point();
-		tmp2.x = x + (float)50;
-	    tmp2.y = y + (float)50;
-        return StructuredText.napSelection(tmp1, tmp2, mST.FZ_SELECT_WORDS);
+		fitz.Point tmp1 = new fitz.Point(x,y);
+		fitz.Point tmp2 = new fitz.Point(x,y);
+        return StructuredText.napSelection(tmp1, tmp2, StructuredText.FZ_SELECT_WORDS);
 	}
 	public boolean onSingleTapUp(MotionEvent e) {
 		Link link = null;

From d398a857ff018d938ef80f1154a80bc0ca9c2a9d Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:45:38 +0000
Subject: [PATCH 43/44] e

---
 .../main/java/com/artifex/mupdf/viewer/ReaderView.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index 8b73a56..024b386 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -2,7 +2,7 @@
 
 import com.artifex.mupdf.fitz.Link;
 import com.artifex.mupdf.fitz.StructuredText;
-import com.artifex.mupdf.fitz;
+//import com.artifex.mupdf.fitz;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
@@ -909,9 +909,9 @@ public void setLinksEnabled(boolean b) {
 		invalidate();
 	}
     public int snapword(float x, float y) {
-		fitz.Point tmp1 = new fitz.Point(x,y);
-		fitz.Point tmp2 = new fitz.Point(x,y);
-        return StructuredText.napSelection(tmp1, tmp2, StructuredText.FZ_SELECT_WORDS);
+		com.artifex.mupdf.fitz.Point tmp1 = new com.artifex.mupdf.fitz.Point(x,y);
+		com.artifex.mupdf.fitz.Point tmp2 = new com.artifex.mupdf.fitz.Point(x,y);
+        return StructuredText.napSelection(tmp1, tmp2, 1);
 	}
 	public boolean onSingleTapUp(MotionEvent e) {
 		Link link = null;

From 61312b199111678b3e21800b76c21fd5bb231ab3 Mon Sep 17 00:00:00 2001
From: linzyt223 <145648429+linzyt223@users.noreply.github.com>
Date: Mon, 30 Sep 2024 01:04:48 +0800
Subject: [PATCH 44/44] w

---
 lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
index 024b386..c9c7799 100644
--- a/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
+++ b/lib/src/main/java/com/artifex/mupdf/viewer/ReaderView.java
@@ -911,7 +911,7 @@ public void setLinksEnabled(boolean b) {
     public int snapword(float x, float y) {
 		com.artifex.mupdf.fitz.Point tmp1 = new com.artifex.mupdf.fitz.Point(x,y);
 		com.artifex.mupdf.fitz.Point tmp2 = new com.artifex.mupdf.fitz.Point(x,y);
-        return StructuredText.napSelection(tmp1, tmp2, 1);
+        return 0;//StructuredText.napSelection(tmp1, tmp2, 1);
 	}
 	public boolean onSingleTapUp(MotionEvent e) {
 		Link link = null;