From f003ca1576584e051df3c14654d699a8fb0ab485 Mon Sep 17 00:00:00 2001 From: 0556sagar <115337324+0556sagar@users.noreply.github.com> Date: Sun, 7 Dec 2025 19:28:39 +0530 Subject: [PATCH 1/7] Add version 2.25.36.xx to supported versions --- app/src/main/res/values/arrays.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 2bba7ec7..a1d44c76 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -129,7 +129,8 @@ 2.25.32.xx 2.25.33.xx 2.25.34.xx - 2.25.35.xx + 2.25.35.xx + 2.25.36.xx 2.25.25.xx @@ -143,6 +144,7 @@ 2.25.33.xx 2.25.34.xx 2.25.35.xx + 2.25.36.xx image/* From d04164ec33d976558b407b6d06469aec38773ba5 Mon Sep 17 00:00:00 2001 From: 0556sagar <115337324+0556sagar@users.noreply.github.com> Date: Sun, 7 Dec 2025 19:29:55 +0530 Subject: [PATCH 2/7] Add manual workflow for greeting input --- .github/workflows/manual.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/manual.yml diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml new file mode 100644 index 00000000..11b2e355 --- /dev/null +++ b/.github/workflows/manual.yml @@ -0,0 +1,32 @@ +# This is a basic workflow that is manually triggered + +name: Manual workflow + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: + workflow_dispatch: + # Inputs the workflow accepts. + inputs: + name: + # Friendly description to be shown in the UI instead of 'name' + description: 'Person to greet' + # Default value if no value is explicitly provided + default: 'World' + # Input has to be provided for the workflow to run + required: true + # The data type of the input + type: string + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "greet" + greet: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Runs a single command using the runners shell + - name: Send greeting + run: echo "Hello ${{ inputs.name }}" From 9fd5ec7ddec150f7cae3bec45ee747b1a38cf7c3 Mon Sep 17 00:00:00 2001 From: 0556sagar <115337324+0556sagar@users.noreply.github.com> Date: Mon, 8 Dec 2025 15:21:38 +0530 Subject: [PATCH 3/7] Add new version item to arrays.xml --- app/src/main/res/values/arrays.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index a1d44c76..e5fdb955 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -129,8 +129,9 @@ 2.25.32.xx 2.25.33.xx 2.25.34.xx - 2.25.35.xx + 2.25.35.xx 2.25.36.xx + 2.25.36.15 2.25.25.xx From be8338245ddcf979d7592f1fbb941af431c84222 Mon Sep 17 00:00:00 2001 From: 0556sagar <115337324+0556sagar@users.noreply.github.com> Date: Mon, 8 Dec 2025 15:35:25 +0530 Subject: [PATCH 4/7] Update build.gradle.kts --- app/build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 527017ef..b16a8462 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -41,10 +41,10 @@ android { defaultConfig { applicationId = "com.wmods.wppenhacer" - minSdk = 28 - targetSdk = 34 + minSdk = 26 + targetSdk = 36 versionCode = 152 - versionName = "1.5.2-DEV ($gitHash)" + versionName = "1.5.8-DEV ($gitHash)" multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -203,4 +203,4 @@ afterEvaluate { } } } -} \ No newline at end of file +} From e342fa8129f3bc9e95448a414d59063f6d1a19df Mon Sep 17 00:00:00 2001 From: 0556sagar <115337324+0556sagar@users.noreply.github.com> Date: Mon, 8 Dec 2025 17:58:48 +0530 Subject: [PATCH 5/7] Update versionName in build.gradle.kts --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b16a8462..973c376a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -44,7 +44,7 @@ android { minSdk = 26 targetSdk = 36 versionCode = 152 - versionName = "1.5.8-DEV ($gitHash)" + versionName = "1.5.8-0556sagar ($gitHash)" multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" From e54ed0876c6400491cec57ced90deaf036d443b9 Mon Sep 17 00:00:00 2001 From: 0556sagar <115337324+0556sagar@users.noreply.github.com> Date: Fri, 26 Dec 2025 09:25:32 +0530 Subject: [PATCH 6/7] Update arrays.xml --- app/src/main/res/values/arrays.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index e5fdb955..a076c8a9 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -131,7 +131,7 @@ 2.25.34.xx 2.25.35.xx 2.25.36.xx - 2.25.36.15 + 2.25.38.xx 2.25.25.xx From 83282162ed3e25338efa42c271b9b3ce7074f3c1 Mon Sep 17 00:00:00 2001 From: 0556sagar <115337324+0556sagar@users.noreply.github.com> Date: Fri, 26 Dec 2025 09:33:08 +0530 Subject: [PATCH 7/7] Update manual.yml --- .github/workflows/manual.yml | 105 ++++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 27 deletions(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 11b2e355..dc863834 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -1,32 +1,83 @@ -# This is a basic workflow that is manually triggered +name: Android CI -name: Manual workflow - -# Controls when the action will run. Workflow runs when manually triggered using the UI -# or API. on: - workflow_dispatch: - # Inputs the workflow accepts. - inputs: - name: - # Friendly description to be shown in the UI instead of 'name' - description: 'Person to greet' - # Default value if no value is explicitly provided - default: 'World' - # Input has to be provided for the workflow to run - required: true - # The data type of the input - type: string - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel + push: + branches: [ "master" ] jobs: - # This workflow contains a single job called "greet" - greet: - # The type of runner that the job will run on + build: + permissions: write-all runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job + if: github.event_name == 'push' && !contains(github.event.head_commit.message, 'Merge') steps: - # Runs a single command using the runners shell - - name: Send greeting - run: echo "Hello ${{ inputs.name }}" + - uses: actions/checkout@v6 + - name: set up JDK 17 + uses: actions/setup-java@v5 + with: + java-version: '17' + distribution: 'temurin' + cache: gradle + + - name: Write key + if: github.event_name != 'pull_request' + run: | + if [ ! -z "${{ secrets.KEY_STORE }}" ]; then + echo androidStorePassword='${{ secrets.KEY_STORE_PASSWORD }}' >> gradle.properties + echo androidKeyAlias='${{ secrets.ALIAS }}' >> gradle.properties + echo androidKeyPassword='${{ secrets.KEY_PASSWORD }}' >> gradle.properties + echo androidStoreFile='key.jks' >> gradle.properties + echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks + fi + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build all flavor variants + run: | + ./gradlew assembleWhatsappDebug assembleBusinessDebug -Pminify=true + + - name: Get short SHA + run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV + + - name: Upload WhatsApp flavor artifacts + uses: actions/upload-artifact@v5 + with: + name: whatsapp-debug-app-${{ env.SHORT_SHA }} + path: app/build/outputs/apk/whatsapp/debug/app-whatsapp-debug.apk + + - name: Upload Business flavor artifacts + uses: actions/upload-artifact@v5 + with: + name: business-debug-app-${{ env.SHORT_SHA }} + path: app/build/outputs/apk/business/debug/app-business-debug.apk + + - name: Post to Telegram channel + if: ${{ success() && github.ref == 'refs/heads/master' && github.ref_type != 'tag' }} + env: + CHANNEL_ID: ${{ secrets.CHANNEL_ID }} + BOT_TOKEN: ${{ secrets.BOT_TOKEN }} + COMMIT_MESSAGE: ${{ github.event.head_commit.message }} + COMMIT_URL: ${{ github.event.head_commit.url }} + run: | + if [ ! -z "${{ secrets.BOT_TOKEN }}" ]; then + GITHUB_SHA_SHORT=$(git rev-parse --short HEAD) + export output_whatsapp=app/WaEnhancer_$GITHUB_SHA_SHORT.apk + export output_business=app/WaEnhancer_Business_$GITHUB_SHA_SHORT.apk + cp app/build/outputs/apk/whatsapp/debug/app-whatsapp-debug.apk $output_whatsapp + cp app/build/outputs/apk/business/debug/app-business-debug.apk $output_business + export LOG=$(cat changelog.txt) + ESCAPED=$(python3 -c 'import json,os,urllib.parse; msg = json.dumps(os.getenv("LOG")); print(urllib.parse.quote(msg if len(msg) <= 1024 else json.dumps(os.getenv("COMMIT_URL"))))') + + # Send WhatsApp variant + curl "https://api.telegram.org/bot${BOT_TOKEN}/sendMediaGroup?chat_id=${CHANNEL_ID}&media=%5B%7B%22type%22%3A%22document%22%2C%20%22media%22%3A%22attach%3A%2F%2Fwa%22%7D%2C%7B%22type%22%3A%22document%22%2C%20%22media%22%3A%22attach%3A%2F%2Fw4b%22%2C%22caption%22%3A${ESCAPED}%7D%5D" -F wa="@$output_whatsapp" -F w4b="@$output_business" + fi + + - name: Upload to GitHub release + uses: softprops/action-gh-release@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + name: WaEnhancer ${{ env.SHORT_SHA }} + body_path: changelog.txt + files: | + app/build/outputs/apk/whatsapp/debug/app-whatsapp-debug.apk + app/build/outputs/apk/business/debug/app-business-debug.apk + tag_name: debug-${{ env.SHORT_SHA }}