Simplify CI and updater APK selection

Streamline GitHub Actions: replace the matrix build with a single build job that assembles the Universal GMS release (assembleUniversalGmsRelease), remove the publish job, simplify cache keys and artifact naming (Echo-Universal), and adjust workflow triggers and Discord message text/labels.

Updater changes: simplify APK selection logic to pick the first non-debug APK asset and extract its size and download URL (remove ABI/flavor detection and complex fallback logic).

Author: iad1tya

.github/workflows/gradle.yml

@@ -5,51 +5,14 @@ on:
     branches: [main]
     tags:
       - 'v*'
-  pull_request:
-    branches: [main]
   workflow_dispatch:
 
 env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
 jobs:
-  build-apks:
+  build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - abi: Universal
-            abi_lower: universal
-            variant: Foss
-            variant_lower: foss
-          - abi: Arm64
-            abi_lower: arm64
-            variant: Foss
-            variant_lower: foss
-          - abi: Armeabi
-            abi_lower: armeabi
-            variant: Foss
-            variant_lower: foss
-          - abi: X86_64
-            abi_lower: x86_64
-            variant: Foss
-            variant_lower: foss
-          - abi: Universal
-            abi_lower: universal
-            variant: Gms
-            variant_lower: gms
-          - abi: Arm64
-            abi_lower: arm64
-            variant: Gms
-            variant_lower: gms
-          - abi: Armeabi
-            abi_lower: armeabi
-            variant: Gms
-            variant_lower: gms
-          - abi: X86_64
-            abi_lower: x86_64
-            variant: Gms
-            variant_lower: gms
 
     steps:
       - name: Checkout Code
@@ -67,9 +30,9 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ matrix.variant }}-${{ matrix.abi }}-${{ hashFiles('**/*.gradle*') }}
+          key: ${{ runner.os }}-gradle-gms-universal-${{ hashFiles('**/*.gradle*') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-${{ matrix.variant }}-${{ matrix.abi }}-
+            ${{ runner.os }}-gradle-gms-universal-
             ${{ runner.os }}-gradle-
 
       - name: Create local.properties
@@ -92,70 +55,32 @@ jobs:
           mkdir -p app/keystore
           echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > app/keystore/release.keystore
 
-      - name: Build Debug APK (PR / Check)
-        if: github.event_name == 'pull_request'
-        run: ./gradlew assemble${{ matrix.abi }}${{ matrix.variant }}Debug
-
       - name: Build and Sign Release APK (Push to main / Dispatch / Tag)
-        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
         env:
           STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
-        run: ./gradlew assemble${{ matrix.abi }}${{ matrix.variant }}Release
+        run: ./gradlew assembleUniversalGmsRelease
 
       - name: Rename and Organize APKs
         run: |
           VERSION_NAME=$(grep "versionName =" app/build.gradle.kts | head -n 1 | awk -F '"' '{print $2}')
           echo "App Version: $VERSION_NAME"
           mkdir -p app/build/outputs/apk/release-artifacts
           find app/build/outputs/apk/ -name "*.apk" ! -path "*/release-artifacts/*" | while read -r apk_path; do
-              lower_path=$(echo "$apk_path" | tr '[:upper:]' '[:lower:]')
-              
-              # 1. Determine build type
-              case "$lower_path" in
-                  *debug*) build_type="debug" ;;
-                  *) build_type="release" ;;
-              esac
-              
-              # 2. Construct target name
-              if [ "$build_type" = "debug" ]; then
-                  target_name="EchoMusic-v${VERSION_NAME}-${{ matrix.variant_lower }}-${{ matrix.abi_lower }}-debug.apk"
-              else
-                  target_name="EchoMusic-v${VERSION_NAME}-${{ matrix.variant_lower }}-${{ matrix.abi_lower }}.apk"
-              fi
-              
+              target_name="Echo-${VERSION_NAME}-Universal.apk"
               cp "$apk_path" "app/build/outputs/apk/release-artifacts/$target_name"
               echo "Copied $apk_path -> app/build/outputs/apk/release-artifacts/$target_name"
           done
 
       - name: Upload APK Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: EchoMusic-${{ matrix.variant_lower }}-${{ matrix.abi_lower }}-${{ github.event_name == 'pull_request' && 'debug' || 'release' }}
+          name: Echo-Universal
           path: app/build/outputs/apk/release-artifacts/*.apk
 
-  publish:
-    needs: build-apks
-    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Download Build Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: downloaded-artifacts
-
-      - name: Flatten Artifacts Directory
-        run: |
-          mkdir -p app/build/outputs/apk/release-artifacts
-          find downloaded-artifacts/ -name "*.apk" -exec cp {} app/build/outputs/apk/release-artifacts/ \;
-          echo "Flattened files list:"
-          ls -R app/build/outputs/apk/release-artifacts
-
       - name: Parse Release Info
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
         run: |
           # 1. Read first line and strip the "# " to get the Title
           TITLE=$(head -n 1 RELEASE_INFO.md | sed 's/^# //')
@@ -248,11 +173,11 @@ jobs:
           # Set title and download link parameters
           TARGET_TITLE="New Beta Build - v$VERSION_NAME"
           DOWNLOAD_LINK="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          LINK_LABEL="Click here to download individual APK ZIPs from GitHub Actions Run Page"
+          LINK_LABEL="Click here to download APK ZIP from GitHub Actions Run Page"
           
           # Construct pings and warning messages
-          PING_TEXT="<@&1498758915536584714> New Beta Build Available"
-          WARNING_TEXT="Note: If you encounter an 'App not installed' error during installation, please uninstall the previous version before installing this update."
+          PING_TEXT="<@&1498758915536584714> New Build Available"
+          WARNING_TEXT="Note: If you're getting an update notification, there's no need to update since you're already using the latest version. Simply disable Automatic Update Check and Update Notifications in the update settings."
           
           # Create Discord Embed JSON securely using jq
           jq -n \
@@ -269,7 +194,7 @@ jobs:
                 description: ($desc + "\n\n" + $warn),
                 color: 7303122,
                 fields: [
-                  { name: "Download APK Artifacts", value: ("[" + $label + "](" + $link + ")"), inline: false }
+                  { name: "Download APK", value: ("[" + $label + "](" + $link + ")"), inline: false }
                 ],
                 footer: { text: "Echo Music Automation System" }
               }]

RELEASE_INFO.md

@@ -1,4 +1,4 @@
 # Echo Music v5.1.6 - Beta Release
 
 - Migrated default Listen Together server to Echo Music Server on Hugging Face (wss://iad1tya-echomusic.hf.space/ws). To modify or verify the URL, navigate to Listen Together > Settings > Server URL.
-- Enhanced in-app updater to dynamically detect device architecture (ABI) and flavor (FOSS/GMS) to download the correct update APK from GitHub Releases.
+- Configured single Universal GMS release APK outputs (Echo-5.1.6-Universal.apk) and streamlined update checker logic.

app/src/main/kotlin/com/music/vivi/echomusic/updater/echomusicupdater.kt

@@ -683,55 +683,17 @@ suspend fun checkForUpdate(
 
                 var apkSizeInMB = ""
                 var apkDownloadUrl = ""
-                
-                var targetApkAsset: JSONObject? = null
-                var fallbackApkAsset: JSONObject? = null
-
-                val isGms = BuildConfig.FLAVOR.lowercase().contains("gms")
-                val targetVariant = if (isGms) "gms" else "foss"
-
-                val supportedAbis = Build.SUPPORTED_ABIS ?: emptyArray()
-                val targetAbi = when {
-                    supportedAbis.contains("arm64-v8a") -> "arm64"
-                    supportedAbis.contains("armeabi-v7a") || supportedAbis.contains("armeabi") -> "armeabi"
-                    supportedAbis.contains("x86_64") -> "x86_64"
-                    else -> "universal"
-                }
-
                 for (j in 0 until assets.length()) {
                     val asset = assets.getJSONObject(j)
-                    val assetName = asset.getString("name").lowercase()
-                    if (assetName.endsWith(".apk")) {
-                        if (assetName.contains(targetVariant)) {
-                            if (assetName.contains(targetAbi)) {
-                                targetApkAsset = asset
-                                break
-                            }
-                            if (assetName.contains("universal")) {
-                                fallbackApkAsset = asset
-                            }
-                        }
+                    val assetName = asset.getString("name")
+                    if (assetName.endsWith(".apk", ignoreCase = true) && !assetName.lowercase().contains("debug")) {
+                        val apkSizeInBytes = asset.getLong("size")
+                        apkSizeInMB = String.format("%.1f", apkSizeInBytes / (1024.0 * 1024.0))
+                        apkDownloadUrl = asset.getString("browser_download_url")
+                        break
                     }
                 }
 
-                val chosenAsset = targetApkAsset ?: fallbackApkAsset ?: run {
-                    var firstApk: JSONObject? = null
-                    for (j in 0 until assets.length()) {
-                        val asset = assets.getJSONObject(j)
-                        if (asset.getString("name").endsWith(".apk", ignoreCase = true)) {
-                            firstApk = asset
-                            break
-                        }
-                    }
-                    firstApk
-                }
-
-                if (chosenAsset != null) {
-                    val apkSizeInBytes = chosenAsset.getLong("size")
-                    apkSizeInMB = String.format("%.1f", apkSizeInBytes / (1024.0 * 1024.0))
-                    apkDownloadUrl = chosenAsset.getString("browser_download_url")
-                }
-
                 if (apkDownloadUrl.isNotEmpty()) {
                     withContext(Dispatchers.Main) {
                         onSuccess(displayTag, true, changelogList, apkSizeInMB, formattedReleaseDate, description, imageUrl, apkDownloadUrl)

app/src/main/res/values/vivi_strings.xml

@@ -900,7 +900,7 @@
     <string name="welcome_update_available">New version is available: %s</string>
     <string name="welcome_everything_ready">Everything is now up to date</string>
     <string name="commits_title">Commits</string>
-    <string name="error_loading_commits">Failed to load commits becoz you didnt pay me ?</string>
+    <string name="error_loading_commits">Failed to load commits</string>
     <string name="commits">Commits</string>
     <string name="view_commit_history">Browse recent changes on main branch</string>
     <string name="suggestions">Suggestions</string>