Merge branch 'release/3.9' into transifex-translations

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: Team-Amaze
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.paypal.me/vishalnehra', 'https://github.com/TeamAmaze/AmazeFileManager#support']

.github/workflows/android-build.yml

@@ -22,7 +22,7 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: Check formatting using spotless
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: spotlessCheck --stacktrace
 
@@ -37,6 +37,6 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: assembledebug --stacktrace

.github/workflows/android-debug-artifact-ondemand.yml

@@ -11,6 +11,11 @@ jobs:
     runs-on: ubuntu-20.04
     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
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          comment-id: ${{ github.event.comment.id }}
+          reactions: '+1'
       - name: Github API Request
         id: request
         uses: octokit/[email protected]
@@ -36,7 +41,7 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: assembleDebug --stacktrace
       - name: Upload fdroid artifact
@@ -49,3 +54,9 @@ jobs:
         with:
           name: Amaze-Play-debug
           path: app/build/outputs/apk/play/debug/app-play-debug.apk
+      - name: Notify the user with a comment once the APK is uploaded # TODO: update this with the link to the artifacts
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            The requested APKs has been built. Please find them from the artifacts section of this PR.

.github/workflows/android-debug-artifact-release.yml

@@ -15,7 +15,7 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: assembleDebug
       - name: Upload fdroid artifact

.github/workflows/android-feature.yml

@@ -20,10 +20,10 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          distribution: "corretto"
+          distribution: "temurin"
           java-version: 11
       - name: Check formatting using spotless
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: spotlessCheck --stacktrace
 
@@ -35,13 +35,13 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          distribution: "corretto"
+          distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: assembledebug --stacktrace
       - name: Run test cases
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: jacocoTestPlayDebugUnitTestReport --stacktrace --info

.github/workflows/android-main.yml

@@ -23,7 +23,7 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: Check formatting using spotless
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: spotlessCheck
 
@@ -40,11 +40,11 @@ jobs:
           distribution: "temurin"
           java-version: 11
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: assembledebug
       - name: Run test cases
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: jacocoTestPlayDebugUnitTestReport
       - name: Publish test cases
@@ -76,7 +76,7 @@ jobs:
         with:
           java-version: 15
       - name: Gradle cache
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
       - name: AVD cache
         uses: actions/cache@v2
         id: avd-cache

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Please keep in mind the points below before considering contributing to Amaze:
 You won't be able to claim the license for changes made by you unless you do that. 
 If there's no license header in any file, please include one from [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html) webpage.
 - Please follow [Android/JAVA code style](https://source.android.com/source/code-style.html) for writing any code, but do not use the Hungarian notation proposed - discussion [here](https://github.com/TeamAmaze/AmazeFileManager/issues/986). 
-Also, follow [Android Material Design guidelines](https://material.io/guidelines/material-design/introduction.html) in case you make changes to any UI element.
+Also, follow [Android Material Design guidelines](https://m3.material.io/get-started) in case you make changes to any UI element.
 - To file a bug report, it is recommended to include the steps to reproduce it; and even better, it helps us a lot if you can capture the error messages in logcat too 
 It is also recommended to enroll to our beta program from Play Store to test and verify any fix for the same.
 
@@ -23,9 +23,11 @@ We will then:
 
 To speed up the review process, please:
 
-- write your code cleanly. We also have our day time work, we are not able to correct the mistakes in your code
+- write your code cleanly. We also have our day time work, we are not able to correct the mistakes in your code.
+- before opening PR, run `./gradlew spotlessCheck` and `./gradlew spotlessApply` in your local to check / fix any formatting issues.
 - describe clearly what your pull request does
 - if you're fixing a particular bug in the issue list, please explicitly say "Fixes #<issue number>" in your description
+- once you've opened PR, look out for CI builds, if there is any code smell / bug - CI will complain, please work on it to keep the code clean.
 - while not required (because automated tests can't test everything), it's recommended you to include [Robolectric](http://robolectric.org/)/[Espresso](https://developer.android.com/training/testing/espresso/) tests in your pull request
 
 Finally:
@@ -35,4 +37,6 @@ Finally:
 - we can be harsh when reviewing your work but because we want to have good code in our codebase. Be patient and carefully read our comments
 - we can be wrong. Again, be patient when discuss with us - we accept reason, but we never accept hate speech
 
-Ready to roll? Start forking ;)
+If we feel your PR is a significant help to us, we'll award you a bounty with any of your preferred mode of payment.  
+Please provide the details for the same once asked.
+Ready to roll? Start forking ;)

README.md

@@ -1,6 +1,7 @@
 ![CI](https://github.com/TeamAmaze/AmazeFileManager/workflows/Android%20Main%20CI/badge.svg?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9ea2667dabaa4e8c98dbf0876ebacd3e)](https://app.codacy.com/gh/TeamAmaze/AmazeFileManager?utm_source=github.com&utm_medium=referral&utm_content=TeamAmaze/AmazeFileManager&utm_campaign=Badge_Grade_Settings)
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/50d8e153feba47b9a8ff82ff57274c56)](https://www.codacy.com/gh/TeamAmaze/AmazeFileManager?utm_source=github.com&utm_medium=referral&utm_content=TeamAmaze/AmazeFileManager&utm_campaign=Badge_Coverage)
+[![Amaze File Manager Downloads](https://www.appbrain.com/shield/com.amaze.filemanager.svg)](https://www.appbrain.com/app/amaze-file-manager/com.amaze.filemanager)
 [![GitHub release](https://img.shields.io/github/release/TeamAmaze/AmazeFileManager.svg)](https://github.com/TeamAmaze/AmazeFileManager/releases)
 [![IzzyOnDroid](https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/com.amaze.filemanager)](https://apt.izzysoft.de/fdroid/index/apk/com.amaze.filemanager)  
 [![Chat on Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/AmazeFileManager)
@@ -43,13 +44,21 @@ Downloads
 [<img alt="Get it on IzzyOnDroid" height="80" src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png">](https://apt.izzysoft.de/fdroid/index/apk/com.amaze.filemanager)
 [<img alt="Get it on AFH" height="50px" src="https://www.androidfilehost.com/images/afh.png">](https://www.androidfilehost.com/?w=files&flid=73967)
 
+Contribute
+---
+You can contribute via one of the following ways:
+- Help us with the translations of either [Amaze File Manager](https://www.transifex.com/amaze/amaze-file-manager/) or [Amaze Utilities](https://crowdin.com/project/amaze-file-utilities)
+- [Contribute](https://github.com/TeamAmaze/AmazeFileManager/blob/release/4.0/CONTRIBUTING.md) directly to the code, help us in fixing the bugs / implement new features.
+
+_If we feel your contribution is a significant help to us, we'll award you a bounty with any of your preferred mode of payment._
+
 Support
 ---
 <a href="https://opencollective.com/TeamAmaze"><img width="20%" alt="OpenCollective" src="opencollective.svg" ></a>
 <a href="https://www.paypal.me/vishalnehra"><img width="20%" src="paypal.svg" alt="PayPal"></a>
 <a href="https://liberapay.com/Team-Amaze/donate"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a>  
 Or buy the [Cloud Plugin](https://play.google.com/store/apps/details?id=com.filemanager.amazecloud) supports Google Drive™, Dropbox, OneDrive and Box accounts.  
-Try our app - [Amaze File Utilities](https://play.google.com/store/apps/details?id=com.amaze.fileutilities)
+Try our app - [Amaze File Utilities](https://play.google.com/store/apps/details?id=com.amaze.fileutilities) ([Fdroid](https://f-droid.org/en/packages/com.amaze.fileutilities/))
 1. List videos / images / music documents in your device in a interactive UI where you're able to group / sort and quickly jump to any headers.
 2. Open videos / images / music / documents (pdf / docx / epub) with inbuilt player.
 3. Share / delete / cast on your tv
@@ -67,12 +76,6 @@ Basic r/w operations might not work on external memory on Kitkat devices. Don't
 
 See our [Privacy Policy](https://github.com/TeamAmaze/AmazeFileManager/wiki/Privacy-Policy)
 
-Translators
-----
-Want to help translate Amaze to your language?  
-
-See [Transifex translation](https://www.transifex.com/amaze/amaze-file-manager/).
-
 Vendors/Developers
 ----
 The device vendors/ROM developers are free to include Amaze apk pre-installed in system. There is no fee required; *but you must comply with the license* (for more information read the [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html) or newer).

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]`

app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'com.hiya.jacoco-android'
 apply plugin: "com.starter.easylauncher"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     packagingOptions {
         resources {
             excludes += ['proguard-project.txt', 'project.properties', 'META-INF/LICENSE.txt', 'META-INF/LICENSE', 'META-INF/NOTICE.txt', 'META-INF/NOTICE', 'META-INF/DEPENDENCIES.txt', 'META-INF/DEPENDENCIES']
@@ -16,10 +16,10 @@ android {
 
     defaultConfig {
         applicationId "com.amaze.filemanager"
-        minSdkVersion 14
-        targetSdkVersion 30
-        versionCode 111
-        versionName "3.8"
+        minSdkVersion 19
+        targetSdkVersion 33
+        versionCode 118
+        versionName "3.8.5"
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
@@ -80,14 +80,17 @@ android {
         }
     }
 
+    sourceSets {
+        test.java.srcDirs += '../testShared/src/test/java'
+    }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-        useIR = true
+        jvmTarget = '11'
     }
 
     testOptions {
@@ -127,9 +130,8 @@ dependencies {
     kapt "androidx.room:room-compiler:$roomVersion"
     // RxJava support for Room
     implementation "androidx.room:room-rxjava2:$roomVersion"
-    kapt 'androidx.annotation:annotation:1.2.0'
+    kapt "androidx.annotation:annotation:$androidXAnnotationVersion"
 
-    implementation "androidx.preference:preference:$androidXPrefVersion"
     implementation "androidx.preference:preference-ktx:$androidXPrefVersion"
 
     //For tests
@@ -141,11 +143,11 @@ dependencies {
     testImplementation "androidx.test:rules:$androidXTestVersion"
     testImplementation "androidx.test.ext:junit:$androidXTestExtVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation "org.mockito:mockito-inline:$mockitoVersion"
+    testImplementation "org.mockito:mockito-inline:$mockitoInlineVersion"
     testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation "org.apache.sshd:sshd-core:1.7.0"
     testImplementation "org.awaitility:awaitility:$awaitilityVersion"
-    testImplementation 'org.jsoup:jsoup:1.11.2'
+    testImplementation "org.jsoup:jsoup:$jsoupVersion"
     testImplementation "androidx.room:room-migration:$roomVersion"
     testImplementation "io.mockk:mockk:$mockkVersion"
     kaptTest "com.google.auto.service:auto-service:1.0-rc4"
@@ -157,7 +159,7 @@ dependencies {
     androidTestImplementation "androidx.test:rules:$androidXTestVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidXTestExtVersion"
     // androidTestImplementation "androidx.test.uiautomator:uiautomator:$uiAutomatorVersion"
-    androidTestImplementation 'commons-net:commons-net:3.6'
+    androidTestImplementation "commons-net:commons-net:$commonsNetVersion"
     androidTestImplementation "org.awaitility:awaitility:$awaitilityVersion"
 
     //Detect memory leaks
@@ -175,16 +177,14 @@ dependencies {
 
     //implementation files('libs/ftplet-api-1.1.0-SNAPSHOT.jar')
     // https://mvnrepository.com/artifact/org.apache.ftpserver/ftplet-api
-    implementation group: 'org.apache.ftpserver', name: 'ftplet-api', version: '1.1.1'
+    implementation "org.apache.ftpserver:ftplet-api:$ftpserverVersion"
 
     //implementation files('libs/ftpserver-core-1.1.0-SNAPSHOT.jar')
     // https://mvnrepository.com/artifact/org.apache.ftpserver/ftpserver-core
-    implementation group: 'org.apache.ftpserver', name: 'ftpserver-core', version: '1.1.1'
+    implementation "org.apache.ftpserver:ftpserver-core:$ftpserverVersion"
 
     implementation 'org.greenrobot:eventbus:3.3.1'
 
-    implementation 'com.android.volley:volley:1.2.1'
-
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
 
@@ -203,6 +203,9 @@ dependencies {
     //FTP
     implementation "commons-net:commons-net:$commonsNetVersion"
 
+    //OkHttp
+    implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
+
     implementation "org.bouncycastle:bcpkix-jdk15on:$bouncyCastleVersion"
     implementation "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
 
@@ -229,29 +232,37 @@ dependencies {
 
     implementation 'org.tukaani:xz:1.9'
 
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
     // (see https://github.com/ReactiveX/RxJava/releases for latest 3.x.x version)
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.9'
+    implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
 
     implementation project(':commons_compress_7z')
     implementation project(':file_operations')
-    implementation "androidx.core:core-ktx:$kotlin_version"
+    implementation project(':portscanner')
+    implementation "androidx.core:core-ktx:$androidXCoreVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "ch.acra:acra-core:5.7.0"
-    runtimeOnly 'org.slf4j:slf4j-api:1.7.32'
+    runtimeOnly 'org.slf4j:slf4j-api:1.7.36'
     runtimeOnly "com.github.tony19:logback-android:$logbackAndroidVersion"
+
+    implementation 'com.google.code.gson:gson:2.9.1'
+
+}
+
+kotlin {
+    jvmToolchain(11)
 }
 
 configurations.all {
     resolutionStrategy {
         dependencySubstitution {
-            substitute module("commons-logging:commons-logging-api:1.1") with module("commons-logging:commons-logging:1.1.1")
-            substitute module("com.android.support:support-annotations:27.1.1") with module("com.android.support:support-annotations:27.0.2")
+            substitute module("commons-logging:commons-logging-api:1.1") using module("commons-logging:commons-logging:1.1.1")
+            substitute module("com.android.support:support-annotations:27.1.1") using module("com.android.support:support-annotations:27.0.2")
             // These two lines are added to prevent possible class clashes between awaitility (which uses hamcrest 2.1) and junit (which uses hamcrest 1.3).
-            substitute module('org.hamcrest:hamcrest-core:1.3') with module("org.hamcrest:hamcrest:2.1")
-            substitute module('org.hamcrest:hamcrest-library:1.3') with module("org.hamcrest:hamcrest:2.1")
+            substitute module('org.hamcrest:hamcrest-core:1.3') using module("org.hamcrest:hamcrest:2.1")
+            substitute module('org.hamcrest:hamcrest-library:1.3') using module("org.hamcrest:hamcrest:2.1")
         }
     }
 }
@@ -288,12 +299,16 @@ jacoco {
     toolVersion = "${jacocoVersion}"
 }
 
+jacocoAndroidUnitTestReport {
+    html.enabled true
+    xml.enabled true
+}
+
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
 
-
 Properties props = new Properties()
 def propFile = new File('signing.properties')