Merge branch 'master' of http://synbox.ruv.wtf:8418/litruv/cinny-mobile

.gitea/workflows/build.yml

@@ -169,3 +169,59 @@ jobs:
           echo ""
 
           echo "Release complete!"
+
+      - name: Create or Update GitHub Release
+        env:
+          GH_TOKEN: ${{ secrets.GHTOKEN }}
+        run: |
+          VERSION="${{ steps.version.outputs.VERSION }}"
+          TAG_NAME="v${VERSION}"
+          API_BASE="https://api.github.com"
+          REPO="Paarrot/Paarrot-Mobile"
+
+          APK=$(find android/app/build/outputs/apk/debug -name "Paarrot-*.apk" | head -1)
+          if [ -z "$APK" ]; then
+            echo "No APK found for GitHub release!"
+            exit 1
+          fi
+          echo "Found APK: $APK"
+
+          RELEASE_RESPONSE=$(curl -s -H "Authorization: token ${GH_TOKEN}" \
+            -H "Accept: application/vnd.github+json" \
+            "${API_BASE}/repos/${REPO}/releases/tags/${TAG_NAME}")
+          RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id // empty')
+
+          if [ -z "$RELEASE_ID" ]; then
+            echo "Creating new GitHub release for ${TAG_NAME}..."
+            RELEASE_RESPONSE=$(curl -s -X POST \
+              -H "Authorization: token ${GH_TOKEN}" \
+              -H "Accept: application/vnd.github+json" \
+              -H "Content-Type: application/json" \
+              -d "{\"tag_name\": \"${TAG_NAME}\", \"name\": \"Release ${TAG_NAME}\", \"body\": \"Release ${VERSION}\", \"draft\": false, \"prerelease\": false}" \
+              "${API_BASE}/repos/${REPO}/releases")
+            RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
+            echo "Created GitHub release with ID: ${RELEASE_ID}"
+          else
+            echo "GitHub release exists with ID: ${RELEASE_ID}, deleting existing assets..."
+            ASSETS=$(curl -s -H "Authorization: token ${GH_TOKEN}" \
+              -H "Accept: application/vnd.github+json" \
+              "${API_BASE}/repos/${REPO}/releases/${RELEASE_ID}/assets" | jq -r '.[].id')
+            for ASSET_ID in $ASSETS; do
+              curl -s -X DELETE \
+                -H "Authorization: token ${GH_TOKEN}" \
+                -H "Accept: application/vnd.github+json" \
+                "${API_BASE}/repos/${REPO}/releases/assets/${ASSET_ID}"
+            done
+          fi
+
+          FILENAME="Paarrot-${VERSION}.apk"
+          echo "Uploading ${FILENAME} to GitHub..."
+          curl -s -X POST \
+            -H "Authorization: token ${GH_TOKEN}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "Content-Type: application/octet-stream" \
+            --data-binary "@${APK}" \
+            "https://uploads.github.com/repos/${REPO}/releases/${RELEASE_ID}/assets?name=${FILENAME}"
+          echo ""
+
+          echo "GitHub release complete!"

overlay/src/app/utils/backgroundSync.ts

@@ -1,6 +1,6 @@
 import { Capacitor, registerPlugin } from '@capacitor/core';
 import type { MatrixClient } from 'matrix-js-sdk';
-
+ 
 interface MatrixBackgroundSyncPlugin {
   /** Start the background sync service with the given Matrix credentials. */
   start(options: {

package.json

@@ -1,22 +1,21 @@
 {
   "name": "paarrot",
+<<<<<<< HEAD
+  "version": "4.11.67",
+=======
   "version": "4.11.83",
+>>>>>>> 47f1b2c40f38dfeb985a1965fe4222614cdfcf23
   "description": "Paarrot - A Matrix client based on Cinny",
   "engines": {
     "node": ">=18.0.0"
   },
   "scripts": {
-    "android:prepare": "node scripts/apply-overlay.mjs && cd cinny && npm install && npm run build && npx cap sync android",
+    "android:prepare": "node -e \"require('fs').copyFileSync('config.json', 'cinny/config.json')\" && cd cinny && npm run build && npx cap sync android",
-    "android:patch-settings:linux": "sed -i 's|../node_modules/|../cinny/node_modules/|g' android/capacitor.settings.gradle",
-    "android:restore": "node scripts/restore-cinny.mjs",
     "android:open": "cd cinny && npx cap open android",
     "android:run": "cd cinny && npx cap run android",
-    "android:apk": "npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug && cd ../.. && node scripts/restore-cinny.mjs",
+    "android:apk": "npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug",
-    "android:apk:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew assembleDebug && cd ../.. && node scripts/restore-cinny.mjs",
+    "android:apk:release": "npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease",
-    "android:apk:release": "npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease && cd ../.. && node scripts/restore-cinny.mjs",
+    "android:aab": "npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease"
-    "android:apk:release:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew assembleRelease && cd ../.. && node scripts/restore-cinny.mjs",
-    "android:aab": "npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease && cd ../.. && node scripts/restore-cinny.mjs",
-    "android:aab:linux": "npm run android:prepare && npm run android:patch-settings:linux && cd cinny/android && ./gradlew bundleRelease && cd ../.. && node scripts/restore-cinny.mjs"
   },
   "keywords": [],
   "author": {