rclone to 1.73 and ndk to 29, Internxt, Drime support

.github/workflows/android.yml

@@ -1,60 +1,137 @@
-name: Android CI
+name: Android CI - Beta Release Build
 
 on:
-  workflow_dispatch:
   push:
-    tags:
-      - '*'
+    branches: [master]
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: 'Reason for manual build'
+        required: false
+        default: 'Manual build'
+
+permissions:
+  contents: write
 
 jobs:
-  createArtifacts:
+  build-and-release:
+    name: Build & Release Beta APKs
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v4
-    - name: Read Go version from project
-      run: echo "GO_VERSION=$(grep -E "^de\.felixnuesse\.extract\.goVersion=" gradle.properties | cut -d'=' -f2)"
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: gradle
-    - name: Set up Go from gradle.properties
-      uses: actions/setup-go@v4
-      with:
-        go-version: '${{env.GO_VERSION}}'
-      id: go
-    - name: Setup Android SDK/NDK
-      uses: android-actions/setup-android@v3
-    - name: Install NDK from gradle.properties
-      run: |
-        NDK_VERSION="$(grep -E "^de\.felixnuesse\.extract\.ndkVersion=" gradle.properties | cut -d'=' -f2)"
-        sdkmanager "ndk;${NDK_VERSION}"
-    - name: Build app
-      run: ./gradlew assembleOssDebug
-    - name: Upload APK (arm)
-      uses: actions/upload-artifact@v4
-      with:
-        name: nightly-armeabi.apk
-        path: ${{ github.workspace }}/app/build/outputs/apk/oss/debug/*-oss-armeabi-v7a-debug.apk
-    - name: Upload APK (arm64)
-      uses: actions/upload-artifact@v4
-      with:
-        name: nightly-arm64.apk
-        path: ${{ github.workspace }}/app/build/outputs/apk/oss/debug/*-oss-arm64-v8a-debug.apk
-    - name: Upload APK (x86)
-      uses: actions/upload-artifact@v4
-      with:
-        name: nightly-x86.apk
-        path: ${{ github.workspace }}/app/build/outputs/apk/oss/debug/*-oss-x86-debug.apk
-    - name: Upload APK (arm)
-      uses: actions/upload-artifact@v4
-      with:
-        name: nightly-x64.apk
-        path: ${{ github.workspace }}/app/build/outputs/apk/oss/debug/*-oss-x86_64-debug.apk
-    - name: Upload APK (universal)
-      uses: actions/upload-artifact@v4
-      with:
-        name: nightly-universal.apk
-        path: ${{ github.workspace }}/app/build/outputs/apk/oss/debug/*-oss-universal-debug.apk
-        retention-days: 14
+      - name: Checkout code
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          # Full history is required: the beta versionCode is derived from
+          # `git rev-list --count HEAD`, which only returns the real commit
+          # count (not 1) when the full history is present. Without this every
+          # beta builds with versionCode 10 and Android refuses the update.
+          fetch-depth: '0'
+
+      - name: Read versions from gradle.properties
+        run: |
+          GO_VERSION=$(grep '^de\.schuelken\.cloudbridge\.goVersion=' gradle.properties | cut -d'=' -f2)
+          NDK_VERSION=$(grep '^de\.schuelken\.cloudbridge\.ndkVersion=' gradle.properties | cut -d'=' -f2)
+          echo "GO_VERSION=$GO_VERSION" >> $GITHUB_ENV
+          echo "NDK_VERSION=$NDK_VERSION" >> $GITHUB_ENV
+
+      - name: Compute beta version
+        id: app-version
+        run: |
+          BASE_NAME=$(grep "versionName " app/build.gradle | grep -oE "[0-9]+\.[0-9]+\.[0-9]+" | head -1)
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          COMMIT_COUNT=$(git rev-list --count HEAD)
+          # versionCode ends in 0 (ABI offsets use 6-9); bump per commit so every beta is a real update
+          VERSION_CODE=$((COMMIT_COUNT * 10))
+          VERSION_NAME="${BASE_NAME}-beta.${SHORT_SHA}"
+          TAG="v${VERSION_NAME}"
+          {
+            echo "version_name=$VERSION_NAME"
+            echo "version_code=$VERSION_CODE"
+            echo "tag=$TAG"
+          } >> "$GITHUB_OUTPUT"
+          echo "CB_VERSION_CODE=$VERSION_CODE" >> "$GITHUB_ENV"
+          echo "CB_VERSION_NAME=$VERSION_NAME" >> "$GITHUB_ENV"
+          echo "Building CloudBridge ${VERSION_NAME} (versionCode ${VERSION_CODE}) as ${TAG}"
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Install Go
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
+        with:
+          go-version: '${{ env.GO_VERSION }}'
+          cache: true
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3
+
+      - name: Install NDK
+        run: |
+          echo "Installing NDK version: ${{ env.NDK_VERSION }}"
+          sdkmanager "ndk;${{ env.NDK_VERSION }}"
+
+      - name: Configure release signing
+        env:
+          CB_KEYSTORE_BASE64: ${{ secrets.CB_KEYSTORE_BASE64 }}
+        run: |
+          mkdir -p app/.config/android
+          echo "$CB_KEYSTORE_BASE64" | base64 -d > app/.config/android/cloudbridge-release.keystore
+
+      - name: Build release APKs
+        env:
+          CB_STORE_FILE: app/.config/android/cloudbridge-release.keystore
+          CB_STORE_PASSWORD: ${{ secrets.CB_STORE_PASSWORD }}
+          CB_KEY_ALIAS: ${{ secrets.CB_KEY_ALIAS }}
+          CB_KEY_PASSWORD: ${{ secrets.CB_KEY_PASSWORD }}
+        run: |
+          echo "Building OSS Release APKs..."
+          ./gradlew assembleOssRelease
+
+      - name: List built APKs
+        run: find app/build/outputs/apk -name '*.apk' -exec ls -lh {} \;
+
+      - name: Delete previous beta releases
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          CURRENT_TAG="${{ steps.app-version.outputs.tag }}"
+          gh release list --json tagName -q '.[].tagName' | grep '\-beta\.' | while read -r tag; do
+            if [ -z "$tag" ] || [ "$tag" = "$CURRENT_TAG" ]; then
+              continue
+            fi
+            echo "Deleting old beta release: $tag"
+            gh release delete "$tag" --yes --cleanup-tag 2>/dev/null || true
+          done
+
+      - name: Create beta release
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
+        with:
+          tag_name: ${{ steps.app-version.outputs.tag }}
+          name: "Beta ${{ steps.app-version.outputs.tag }}"
+          prerelease: true
+          body: |
+            ## CloudBridge Beta Build
+
+            **Version:** ${{ steps.app-version.outputs.version_name }}
+            **Commit:** ${{ github.sha }}
+            **Branch:** ${{ github.ref_name }}
+
+            Auto-built from latest master push.
+
+            ### Downloads
+            - **arm64-v8a** — most modern phones (Pixel, Samsung, etc.)
+            - **armeabi-v7a** — older 32-bit ARM devices
+            - **x86_64** — emulators / ChromeOS
+            - **x86** — older emulators
+            - **universal** — all architectures (larger file)
+          files: |
+            app/build/outputs/apk/oss/release/*-oss-armeabi-v7a-release.apk
+            app/build/outputs/apk/oss/release/*-oss-arm64-v8a-release.apk
+            app/build/outputs/apk/oss/release/*-oss-x86-release.apk
+            app/build/outputs/apk/oss/release/*-oss-x86_64-release.apk
+            app/build/outputs/apk/oss/release/*-oss-universal-release.apk

.github/workflows/dependencies.yml

@@ -9,10 +9,10 @@ jobs:
     outputs:
       changed: ${{ steps.changeDetection.outputs.should-run }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
       - name: Verify build.gradle changed
         id: changeDetection
         env:
@@ -31,25 +31,28 @@ jobs:
     needs: dependency-change-verification
     if: needs.dependency-change-verification.outputs.changed == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
       - name: Read Go version from project
-        run: echo "GO_VERSION=$(grep -E "^de\.felixnuesse\.extract\.goVersion=" gradle.properties | cut -d'=' -f2)"
+        run: |
+          GO_VERSION=$(grep -E "^de\.schuelken\.cloudbridge\.goVersion=" gradle.properties | cut -d'=' -f2)
+          echo "GO_VERSION=$GO_VERSION" >> $GITHUB_ENV
+          echo "Go version: $GO_VERSION"
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: gradle
       - name: Set up Go from gradle.properties
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version: '${{env.GO_VERSION}}'
         id: go
       - name: Setup Android SDK/NDK
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3
       - name: Install NDK from gradle.properties
         run: |
-          NDK_VERSION="$(grep -E "^de\.felixnuesse\.extract\.ndkVersion=" gradle.properties | cut -d'=' -f2)"
+          NDK_VERSION="$(grep -E "^de\.schuelken\.cloudbridge\.ndkVersion=" gradle.properties | cut -d'=' -f2)"
           sdkmanager "ndk;${NDK_VERSION}"
       - name: Build app
         run: ./gradlew assembleOssDebug
@@ -58,18 +61,19 @@ jobs:
         run: |
           # prepare scanapk with apktool.
           wget https://github.com/iBotPeaches/Apktool/releases/download/v$apktoolVersion/apktool_$apktoolVersion.jar
-          # Wrapper for apktool_*.jar
-          wget https://github.com/iBotPeaches/Apktool/raw/master/scripts/linux/apktool
+          # Wrapper for apktool_*.jar. Upstream removed scripts/linux/apktool (404), so inline a
+          # minimal one that just invokes the jar from its own directory.
+          printf '#!/bin/bash\njava -jar "$(dirname "$0")/apktool.jar" "$@"\n' > apktool
           # clone izzy's repo with the scan tools
           git clone https://gitlab.com/IzzyOnDroid/repo.git
           # create a directory for Apktool and move the apktool* files there
           mkdir -p repo/lib/radar/tool
           mv apktool* repo/lib/radar/tool
           chmod u+x repo/lib/radar/tool/apktool
           mv repo/lib/radar/tool/apktool_$apktoolVersion.jar repo/lib/radar/tool/apktool.jar
-          repo/bin/scanapk.php app/build/outputs/apk/oss/debug/roundsync_v*-oss-universal-debug.apk
+          repo/bin/scanapk.php app/build/outputs/apk/oss/debug/cloudbridge_v*-oss-universal-debug.apk
         env:
           apktoolVersion: "2.9.3"
       - name: 'Get Commit Hash'
         id: commit
-        uses: pr-mpt/actions-commit-hash@v1
+        uses: pr-mpt/actions-commit-hash@d06222114eac9daa8cfe0a748462a83e651aa136 # v1

.github/workflows/lint.yml

@@ -10,18 +10,20 @@ jobs:
   checkLint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: gradle
+      - name: Unit tests
+        run: ./gradlew testOssDebugUnitTest -x :rclone:buildAll
       - name: Run Linter
         run: ./gradlew lint -x :rclone:buildAll
       - name: Upload Reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: Lint Reports
           path: ~/**/build/reports/

.github/workflows/translations.yml

@@ -11,10 +11,10 @@ jobs:
       changed: ${{ steps.changeDetection.outputs.should-run }}
       files: ${{ steps.changeDetection.outputs.files }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
       - name: Verify build.gradle changed
         id: changeDetection
         env:
@@ -36,7 +36,7 @@ jobs:
     needs: string-change-verification
     if: needs.string-change-verification.outputs.changed == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           fetch-depth: 0
       - name: Prepare Profanity Check
@@ -55,7 +55,7 @@ jobs:
           TRANSLATIONS=$(./scripts/generateFilelist.sh ${{ github.event.pull_request.commits }} ${{needs.string-change-verification.outputs.files}})
           echo "TRANSLATIONS=$TRANSLATIONS" >> $GITHUB_OUTPUT
         shell: sh
-      - uses: fabasoad/translation-action@main
+      - uses: fabasoad/translation-action@1476a9db97feaa816029bc027103eb89f3b017bf # v4.2.4
         id: google-translate
         with:
           provider: google
@@ -68,7 +68,7 @@ jobs:
           ./scripts/checkProfanity.py translated_texts.txt
         shell: sh
       - name: Upload Raw Translations
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: Translations
           path: |

.gitignore

@@ -42,8 +42,11 @@ captures/
 .idea/libraries
 .idea/caches
 
-# Keystore files
+# Keystore files (release signing keys must never be committed)
 *.jks
+*.keystore
+# Local signing credentials for release builds (see app/build.gradle)
+keystore.properties
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -70,3 +73,11 @@ debug/
 .idea/codeStyles/codeStyleConfig.xml
 .idea/inspectionProfiles/Project_Default.xml
 .idea/
+
+# Node (not used by this Android project)
+node_modules/
+package.json
+package-lock.json
+
+# Local ZCode IDE state
+.zcode/

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}