hotfix/3.11.3 to release/4.0

.github/workflows/android-main.yml

@@ -16,9 +16,9 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: 17
@@ -28,20 +28,20 @@ jobs:
           ndk-version: r28c
           link-to-sdk: true
           local-cache: true
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
       - name: Check formatting using spotless
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: spotlessCheck
+        run: ./gradlew spotlessCheck
 
   build:
     name: Build debug, Jacoco test and publish to codacy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: 17
@@ -50,7 +50,7 @@ jobs:
         with:
           toolchain: stable
       - name: Cache Rust dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ~/.cargo/bin/
@@ -78,14 +78,12 @@ jobs:
             echo "❌ .cargo/config.toml missing"
             exit 1
           fi
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
       - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: assembledebug
+        run: ./gradlew assembledebug
       - name: Run test cases
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: jacocoTestPlayDebugUnitTestReport
+        run: ./gradlew jacocoTestPlayDebugUnitTestReport
       - name: Publish test cases
         run: |
           export CODACY_PROJECT_TOKEN=${{ secrets.CODACY_TOKEN }}
@@ -109,21 +107,52 @@ jobs:
         api-level: [ 21, 28 ]
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Java 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: 17
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+      - name: Cache Rust dependencies
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            file_operations/target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+      - name: Setup Rust for Android
+        run: |
+          cd file_operations
+          chmod +x setup_rust_android.sh
+          ./setup_rust_android.sh
+      - name: Verify Rust setup
+        run: |
+          cd file_operations
+          echo "🔍 Verifying Rust Android targets..."
+          rustup target list --installed | grep android || echo "No Android targets found"
+          echo "🔍 Verifying cargo configuration..."
+          if [ -f .cargo/config.toml ]; then
+            echo "✅ .cargo/config.toml exists"
+          else
+            echo "❌ .cargo/config.toml missing"
+            exit 1
+          fi
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
-      - name: Gradle cache
-        uses: gradle/actions/setup-gradle@v3
       - name: AVD cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: avd-cache
         with:
           path: |

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "com.amaze.filemanager"
         minSdkVersion libs.versions.minSdk.get().toInteger()
         targetSdkVersion libs.versions.targetSdk.get().toInteger()
-        versionCode 124
-        versionName "3.11.2"
+        versionCode 125
+        versionName "3.11.3"
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true

app/proguard.cfg

@@ -86,17 +86,14 @@
 -keep class org.bouncycastle.crypto.prng.* {*;}
 -keep class org.bouncycastle.crypto.signers.* {*;}
 
--keep class org.bouncycastle.jcajce.provider.asymmetric.* {*;}
--keep class org.bouncycastle.jcajce.provider.asymmetric.util.* {*;}
--keep class org.bouncycastle.jcajce.provider.asymmetric.dh.* {*;}
--keep class org.bouncycastle.jcajce.provider.asymmetric.ec.* {*;}
--keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.* {*;}
+-keep class org.bouncycastle.jcajce.provider.asymmetric.** {*;}
 
 -keep class org.bouncycastle.jcajce.provider.digest.** {*;}
 -keep class org.bouncycastle.jcajce.provider.keystore.** {*;}
 -keep class org.bouncycastle.jcajce.provider.symmetric.** {*;}
 -keep class org.bouncycastle.jcajce.spec.* {*;}
 -keep class org.bouncycastle.jce.** {*;}
+-keep class org.bouncycastle.openssl.** {*;}
 
 -dontwarn org.bouncycastle.jsse.**
 -dontwarn org.bouncycastle.asn1.ASN1ApplicationSpecific
@@ -127,4 +124,7 @@
 }
 
 -keep class com.amaze.trashbin.** { *; }
--dontwarn ch.qos.logback.core.net.*
+-dontwarn ch.qos.logback.core.net.*
+
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile

app/src/androidTest/java/com/amaze/filemanager/test/StoragePermissionHelper.kt

@@ -21,6 +21,8 @@
 package com.amaze.filemanager.test
 
 import android.content.Context
+import android.os.Build
+import android.os.Build.VERSION_CODES
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
@@ -40,16 +42,21 @@ object StoragePermissionHelper {
      */
     @JvmStatic
     fun grantManageStoragePermission() {
+        // Only need to run on Androids >= R
+        if (Build.VERSION.SDK_INT < VERSION_CODES.R) {
+            return
+        }
+
         // Ensure that an activity that has the dialog is launched
         ActivityScenario.launch(MainActivity::class.java)
 
         val context: Context = InstrumentationRegistry.getInstrumentation().targetContext
         val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
         val amazeResources = context.packageManager.getResourcesForApplication(context.packageName)
-        val grantPermissionExplanation = amazeResources.getString(R.string.grant_all_files_permission)
+        val grantPermissionHeader = amazeResources.getString(R.string.grantper)
 
-        if (device.hasObject(By.text(grantPermissionExplanation))) {
+        if (device.hasObject(By.text(grantPermissionHeader))) {
             // First press Amaze's grant button
             onView(withText(R.string.grant)).perform(click())