Merge branch 'master' into master

Author: Saeedhany

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:9cbed754112939e914291337b5e554b07ad7c392491dba6daf25eef1332a22e8
+FROM ubuntu:noble@sha256:353675e2a41babd526e2b837d7ec780c2a05bca0164f7ea5dbbd433d21d166fc
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk

.github/workflows/codeql.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -57,4 +57,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5

.github/workflows/scorecard.yml

@@ -34,14 +34,14 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif
           publish_results: false
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
         with:
           sarif_file: results.sarif

.github/workflows/screenShotTest.yml

@@ -28,14 +28,14 @@ jobs:
             -   uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
             -   name: Gradle cache
-                uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+                uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
                 with:
                     path: |
                         ~/.gradle/caches
                         ~/.gradle/wrapper
                     key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
             -   name: AVD cache
-                uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+                uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
                 id: avd-cache
                 with:
                     path: |

README.md

@@ -12,6 +12,9 @@ height="80">](https://play.google.com/store/apps/details?id=com.nextcloud.client
 [<img src="https://f-droid.org/badge/get-it-on.png"
 alt="Get it on F-Droid"
 height="80">](https://f-droid.org/packages/com.nextcloud.client/)
+[<img src="https://github.com/user-attachments/assets/713d71c5-3dec-4ec4-a3f2-8d28d025a9c6"
+alt="Get it with Obtainium"
+height="80">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.nextcloud.client%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fnextcloud%2Fandroid%22%2C%22author%22%3A%22nextcloud%22%2C%22name%22%3A%22Nextcloud%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5Enextcloud.*%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22Nextcloud%20ist%20eine%20Cloudanwendung%2C%20die%20selbst%20gehostet%20werden%20kann.%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Atrue%7D%22%2C%22overrideSource%22%3Anull%7D)
 
 Signing certificate fingerprint to [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK:
 - APK with "gplay" name, found [here](https://github.com/nextcloud/android/releases) or distributed via Google Play Store

app/build.gradle

@@ -32,6 +32,7 @@ plugins {
     alias(libs.plugins.spotless)
     alias(libs.plugins.kapt)
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.kotlin.serialization)
 }
 
 apply plugin: "com.android.application"
@@ -69,7 +70,7 @@ configurations.configureEach {
         }
 
         if (requested.group == "commons-logging" && requested.name == "commons-logging") {
-            useTarget("org.slf4j:jcl-over-slf4j:1.7.4")
+            useTarget("org.slf4j:jcl-over-slf4j:1.7.36")
         }
     }
 }
@@ -496,6 +497,9 @@ dependencies {
     // region Image loading
     implementation libs.coil
     // endregion
+
+    // kotlinx.serialization
+    implementation(libs.kotlinx.serialization.json)
 }
 
 

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -400,11 +400,6 @@ public BatteryStatus getBattery() {
             public boolean isPowerSavingEnabled() {
                 return false;
             }
-
-            @Override
-            public boolean isPowerSavingExclusionAvailable() {
-                return false;
-            }
         };
 
         UserAccountManager accountManager = UserAccountManagerImpl.fromContext(targetContext);

app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java

@@ -216,11 +216,6 @@ public BatteryStatus getBattery() {
             public boolean isPowerSavingEnabled() {
                 return false;
             }
-
-            @Override
-            public boolean isPowerSavingExclusionAvailable() {
-                return false;
-            }
         };
 
         UserAccountManager accountManager = UserAccountManagerImpl.fromContext(targetContext);

app/src/androidTest/java/com/owncloud/android/UploadIT.java

@@ -82,12 +82,6 @@ public Connectivity getConnectivity() {
         public boolean isPowerSavingEnabled() {
             return false;
         }
-
-        @Override
-        public boolean isPowerSavingExclusionAvailable() {
-            return false;
-        }
-
         @NonNull
         @Override
         public BatteryStatus getBattery() {
@@ -237,11 +231,6 @@ public boolean isPowerSavingEnabled() {
                 return false;
             }
 
-            @Override
-            public boolean isPowerSavingExclusionAvailable() {
-                return false;
-            }
-
             @NonNull
             @Override
             public BatteryStatus getBattery() {

app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt

@@ -46,9 +46,6 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
         override val isPowerSavingEnabled: Boolean
             get() = false
 
-        override val isPowerSavingExclusionAvailable: Boolean
-            get() = false
-
         override val battery: BatteryStatus
             get() = BatteryStatus()
     }