Merge branch 'nextcloud:master' into master

Author: xavi-b

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:c4570d2f4665d5d118ae29fb494dee4f8db8fcfaee0e37a2e19b827f399070d3
+FROM ubuntu:noble@sha256:a08e551cb33850e4740772b38217fc1796a66da2506d312abe51acda354ff061
 
 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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4

.github/workflows/scorecard.yml

@@ -42,6 +42,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif

app/build.gradle

@@ -312,14 +312,14 @@ dependencies {
     implementation "androidx.webkit:webkit:1.14.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.exifinterface:exifinterface:1.4.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1"
-    implementation "androidx.lifecycle:lifecycle-service:2.9.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2"
+    implementation "androidx.lifecycle:lifecycle-service:2.9.2"
     implementation "androidx.work:work-runtime:$workRuntime"
     implementation "androidx.work:work-runtime-ktx:$workRuntime"
     implementation "androidx.fragment:fragment-ktx:1.8.8"
     implementation "com.github.albfernandez:juniversalchardet:2.5.0" // need this version for Android <7
     compileOnly "com.google.code.findbugs:annotations:3.0.1u2"
-    implementation "commons-io:commons-io:2.19.0"
+    implementation "commons-io:commons-io:2.20.0"
     implementation "org.greenrobot:eventbus:3.3.1"
     implementation "com.googlecode.ez-vcard:ez-vcard:0.12.1"
     implementation "org.lukhnos:nnio:0.3.1"
@@ -334,15 +334,15 @@ dependencies {
     implementation "com.caverock:androidsvg:1.4"
     implementation "androidx.annotation:annotation:1.9.1"
     implementation "com.vanniktech:emoji-google:0.21.0"
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2")
 
     // document scanner not available on FDroid (generic) due to OpenCV binaries
     gplayImplementation project(":appscan")
     huaweiImplementation project(":appscan")
     qaImplementation project(":appscan")
 
     spotbugsPlugins "com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0"
-    spotbugsPlugins "com.mebigfatguy.fb-contrib:fb-contrib:7.6.11"
+    spotbugsPlugins "com.mebigfatguy.fb-contrib:fb-contrib:7.6.12"
 
     implementation "com.google.dagger:dagger:$daggerVersion"
     implementation "com.google.dagger:dagger-android:$daggerVersion"

app/screenshots/generic/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showSharedFiles.png

@@ -7,15 +7,14 @@
 
 package com.nextcloud.utils
 
-import com.google.gson.Gson
 import com.owncloud.android.datamodel.quickPermission.QuickPermissionType
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
-import com.owncloud.android.lib.resources.shares.attributes.ShareAttributes
+import com.owncloud.android.lib.resources.shares.extensions.isAllowDownloadAndSyncEnabled
+import com.owncloud.android.lib.resources.shares.extensions.toggleAllowDownloadAndSync
 import com.owncloud.android.ui.fragment.util.SharePermissionManager
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
-import junit.framework.TestCase.assertNotNull
 import junit.framework.TestCase.assertTrue
 import org.junit.Test
 
@@ -251,17 +250,23 @@ class SharePermissionManagerTest {
     // region Attributes Tests
     @Test
     fun testToggleAllowDownloadAndSyncShouldCreateAttributeJsonIfNoneExists() {
-        val json = SharePermissionManager.toggleAllowDownloadAndSync(true, null)
-        assertNotNull(json)
-        val downloadAttribute = ShareAttributes.createDownloadAttributes(true)
-        val expectedJson = Gson().toJson(listOf(downloadAttribute))
-        assertEquals(json, expectedJson)
+        val ocShare = OCShare().apply {
+            isFolder = true
+            shareType = ShareType.USER
+            permissions = 17
+        }
+        ocShare.attributes = toggleAllowDownloadAndSync(
+            ocShare.attributes,
+            isChecked = true,
+            useV2DownloadAttributes = false
+        )
+        assertTrue(ocShare.isAllowDownloadAndSyncEnabled(false))
     }
 
     @Test
     fun testIsAllowDownloadAndSyncEnabledShouldReturnFalseIfAttributeIsMissing() {
         val share = createShare(OCShare.READ_PERMISSION_FLAG, attributesJson = null)
-        assertFalse(SharePermissionManager.isAllowDownloadAndSyncEnabled(share))
+        assertFalse(share.isAllowDownloadAndSyncEnabled(false))
     }
     // endregion
 }