chore: bump version to 4.11.83 [skip ci]

.gitea/workflows/build.yml

@@ -47,7 +47,7 @@ jobs:
           git commit -m "chore: bump version to ${{ steps.bump.outputs.VERSION }} [skip ci]"
           git push
 
-  build-android:
+  build-and-release:
     runs-on: ubuntu-latest
     needs: increment-version
     if: always() && (needs.increment-version.outputs.should_build == 'true' || needs.increment-version.result == 'skipped')
@@ -56,6 +56,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           submodules: false
           ref: ${{ github.ref_name }}
 
@@ -92,28 +93,6 @@ jobs:
       - name: Apply overlay and build Android APK
         run: npm run android:apk:linux
 
-      - name: Upload APK
-        uses: actions/upload-artifact@v3
-        with:
-          name: Paarrot-Android-debug.apk
-          path: android/app/build/outputs/apk/debug/app-debug.apk
-
-  create-release:
-    runs-on: ubuntu-latest
-    needs: [increment-version, build-android]
-    if: always() && needs.build-android.result == 'success'
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: ${{ github.ref_name }}
-
-      - name: Pull latest (after version bump)
-        if: github.ref == 'refs/heads/master'
-        run: git pull origin master
-
       - name: Get version
         id: version
         run: |
@@ -143,21 +122,6 @@ jobs:
           git tag -a "v${{ steps.version.outputs.VERSION }}" -m "Release v${{ steps.version.outputs.VERSION }}"
           git push origin "v${{ steps.version.outputs.VERSION }}"
 
-      - name: Download all artifacts
-        uses: actions/download-artifact@v3
-        with:
-          path: artifacts
-
-      - name: Prepare release files
-        run: |
-          mkdir -p release-files
-          find artifacts -type f \( -name "*.exe" -o -name "*.AppImage" -o -name "*.nupkg" -o -name "RELEASES*" \) -exec cp {} release-files/ \;
-          APK=$(find artifacts -type f -name "*.apk" | head -1)
-          if [ -n "$APK" ]; then
-            cp "$APK" "release-files/Paarrot.apk"
-          fi
-          ls -la release-files/
-
       - name: Create or Update Release
         env:
           GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -167,6 +131,13 @@ jobs:
           API_BASE="http://synbox.ruv.wtf:8418/api/v1"
           REPO="litruv/cinny-mobile"
 
+          APK=$(find android/app/build/outputs/apk/debug -name "Paarrot-*.apk" | head -1)
+          if [ -z "$APK" ]; then
+            echo "No APK found!"
+            exit 1
+          fi
+          echo "Found APK: $APK"
+
           RELEASE_ID=$(curl -s -H "Authorization: token ${GITEA_TOKEN}" \
             "${API_BASE}/repos/${REPO}/releases/tags/${TAG_NAME}" | jq -r '.id // empty')
 
@@ -188,16 +159,13 @@ jobs:
             done
           fi
 
-          echo "Uploading assets..."
+          FILENAME="Paarrot-${VERSION}.apk"
-          for FILE in release-files/*; do
+          echo "Uploading ${FILENAME}..."
-            FILENAME=$(basename "$FILE")
+          curl -s -X POST \
-            echo "Uploading ${FILENAME}..."
+            -H "Authorization: token ${GITEA_TOKEN}" \
-            curl -s -X POST \
+            -H "Content-Type: application/octet-stream" \
-              -H "Authorization: token ${GITEA_TOKEN}" \
+            --data-binary "@${APK}" \
-              -H "Content-Type: application/octet-stream" \
+            "${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=${FILENAME}"
-              --data-binary "@${FILE}" \
+          echo ""
-              "${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=${FILENAME}"
-            echo ""
-          done
 
           echo "Release complete!"

android/app/build.gradle

@@ -23,6 +23,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            outputFileName = "Paarrot-${variant.versionName}.apk"
+        }
+    }
 }
 
 repositories {

android/app/src/main/java/com/paarrot/app/MatrixSyncService.kt

@@ -143,10 +143,11 @@ class MatrixSyncService : Service() {
         val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         ensureMessageChannel(nm)
 
-        joinedRooms.keys().forEach { roomId ->
+        val roomIds = joinedRooms.keys().asSequence().toList()
+        for (roomId in roomIds) {
             val timeline = joinedRooms.optJSONObject(roomId)
-                ?.optJSONObject("timeline") ?: return@forEach
+                ?.optJSONObject("timeline") ?: continue
-            val events = timeline.optJSONArray("events") ?: return@forEach
+            val events = timeline.optJSONArray("events") ?: continue
 
             for (i in 0 until events.length()) {
                 val event = events.optJSONObject(i) ?: continue
@@ -157,7 +158,7 @@ class MatrixSyncService : Service() {
                 if (eventId.isNotBlank() && !shownEventIds.add(eventId)) continue
 
                 val content = event.optJSONObject("content") ?: continue
-                val body = content.optString("body").ifBlank { continue }
+                val body = content.optString("body").takeIf { it.isNotBlank() } ?: continue
                 val sender = event.optString("sender")
                 val senderName = sender.substringAfter("@").substringBefore(":")
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paarrot",
-  "version": "4.11.78",
+  "version": "4.11.83",
   "description": "Paarrot - A Matrix client based on Cinny",
   "engines": {
     "node": ">=18.0.0"

scripts/apply-overlay.mjs

@@ -120,7 +120,23 @@ if (!existsSync(androidJunction)) {
   console.log(`  android/ link already exists, skipping`);
 }
 
-// 7. Write android/local.properties with the current machine's Android SDK path
+// 8. Sync version from root package.json into android/app/build.gradle
+console.log('[apply-overlay] Syncing version into build.gradle...');
+const rootPkg = JSON.parse(readFileSync(join(ROOT, 'package.json'), 'utf8'));
+const version = rootPkg.version ?? '1.0.0';
+const parts = version.split('.').map(Number);
+// versionCode: major*10000 + minor*100 + patch  (e.g. 4.11.78 -> 41178)
+const versionCode = (parts[0] ?? 0) * 10000 + (parts[1] ?? 0) * 100 + (parts[2] ?? 0);
+
+const buildGradlePath = join(androidTarget, 'app', 'build.gradle');
+let buildGradle = readFileSync(buildGradlePath, 'utf8');
+buildGradle = buildGradle
+  .replace(/versionCode\s+\d+/, `versionCode ${versionCode}`)
+  .replace(/versionName\s+"[^"]+"/, `versionName "${version}"`);
+writeFileSync(buildGradlePath, buildGradle, 'utf8');
+console.log(`  versionName "${version}", versionCode ${versionCode}`);
+
+// 9. Write android/local.properties with the current machine's Android SDK path
 const androidHome = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
 if (androidHome) {
   console.log('[apply-overlay] Writing android/local.properties...');