Merge branch 'release/4.0' into issue/1555

TeamAmaze · Jun 9, 2024 · 7c65a62 · 7c65a62
2 parents 232b318 + aa89649
commit 7c65a62
Show file tree

Hide file tree

Showing 782 changed files with 27,246 additions and 12,179 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*.{kt,kts}]
+ktlint_standard_property-naming = disabled
+ktlint_standard_value-argument-comment = disabled
+ktlint_standard_kdoc-wrapping = disabled
+ktlint_standard_no-consecutive-comments = disabled
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,9 @@
+# Run this command to always ignore specific commits in `git blame`
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# format all java files
+94dae8259f075e4099cd92c258386dc39bfc30c1
+
+# format all kotlin files
+45178b3d348cd1fe768bcfc086b04b15ea5d69ea
+
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -13,30 +13,30 @@ concurrency:
 jobs:
   check_spotless:
     name: Check spotless
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Check formatting using spotless
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: spotlessCheck --stacktrace
 
   build:
     name: Build debug
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assembledebug --stacktrace
diff --git a/.github/workflows/android-debug-artifact-ondemand.yml b/.github/workflows/android-debug-artifact-ondemand.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   apk:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.event.comment.body == 'Build test apk' && (github.actor == 'VishalNehra' || github.actor == 'TranceLove' || github.actor == 'EmmanuelMess' || github.actor == 'VishnuSanal')
     steps:
       - name: Acknowledge the request with thumbs up reaction
@@ -30,27 +30,27 @@ jobs:
           echo "::set-output name=repo_clone_url::${{ fromJson(steps.request.outputs.data).head.repo.clone_url }}"
           echo "::set-output name=repo_ssh_url::${{ fromJson(steps.request.outputs.data).head.repo.ssh_url }}"
       - name: Checkout PR Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{fromJson(steps.request.outputs.data).head.repo.full_name}}
           ref: ${{fromJson(steps.request.outputs.data).head.ref}}
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assembleDebug --stacktrace
       - name: Upload fdroid artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Amaze-Fdroid-debug
           path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
       - name: Upload play artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Amaze-Play-debug
           path: app/build/outputs/apk/play/debug/app-play-debug.apk

diff --git a/.github/workflows/android-debug-artifact-release.yml b/.github/workflows/android-debug-artifact-release.yml
@@ -6,25 +6,25 @@ on:
 
 jobs:
   apk:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assembleDebug
       - name: Upload fdroid artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Amaze-Fdroid-debug
           path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
       - name: Upload play artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Amaze-Play-debug
           path: app/build/outputs/apk/play/debug/app-play-debug.apk
diff --git a/.github/workflows/android-feature.yml b/.github/workflows/android-feature.yml
@@ -14,34 +14,34 @@ concurrency:
 jobs:
   check_spotless:
     name: Check spotless
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Check formatting using spotless
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: spotlessCheck --stacktrace
 
   build:
     name: Build debug and run Jacoco tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assembledebug --stacktrace
       - name: Run test cases
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: jacocoTestPlayDebugUnitTestReport --stacktrace --info
diff --git a/.github/workflows/android-main.yml b/.github/workflows/android-main.yml
@@ -14,37 +14,37 @@ concurrency:
 jobs:
   check_spotless:
     name: Check spotless
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Check formatting using spotless
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: spotlessCheck
 
   build:
     name: Build debug, Jacoco test and publish to codacy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assembledebug
       - name: Run test cases
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: jacocoTestPlayDebugUnitTestReport
       - name: Publish test cases
@@ -70,15 +70,15 @@ jobs:
         api-level: [ 16, 19, 28 ]
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Java 15
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 15
       - name: Gradle cache
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
       - name: AVD cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: avd-cache
         with:
           path: |

diff --git a/README.md b/README.md
@@ -85,9 +85,10 @@ We strongly recommend using apk signed by us (either Play Store version or from
 ### License: 
 
     Copyright (C) 2014-2018 Arpit Khurana <[email protected]>
-    Copyright (C) 2014-2021 Vishal Nehra <[email protected]>
-    Copyright (C) 2017-2021 Emmanuel Messulam <[email protected]>
-    Copyright (C) 2018-2021 Raymond Lai <airwave209gt at gmail.com>
+    Copyright (C) 2014-2024 Vishal Nehra <[email protected]>
+    Copyright (C) 2017-2024 Emmanuel Messulam <[email protected]>
+    Copyright (C) 2018-2024 Raymond Lai <airwave209gt at gmail.com>
+    Copyright (C) 2019-2024 Vishnu Sanal T <t.v.s10123 at gmail.com>
     This file is part of Amaze File Manager.
     Amaze File Manager is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,20 @@
+# Security Policy
+
+## Supported Versions
+
+`v3.8.5` supports Android 4.0 and above.
+`v4.x.x` would only support Android 4.4 and above.
+
+Android devices that runs Android versions less that Android 4.4
+(Android KitKat) would not receive any more updates (the latest
+supported version would be `v3.8.5`).
+
+## Reporting a Vulnerability
+
+Feel free to contact us via `[email protected]`.
+
+Please CC the maintainers too:
+-   `[email protected]`
+-   `[email protected]`
+-   `[email protected]`
+-   `[email protected]`
diff --git a/spotless.license-java → amaze.license.spotless.txt b/spotless.license-java → amaze.license.spotless.txt