Merge branch 'feature/add-share-permissions' of https://github.com/nextcloud/android into feature/add-share-permissions

Author: mpivchev

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782
+FROM ubuntu:noble@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk

.github/ISSUE_TEMPLATE/config.yml

@@ -4,6 +4,9 @@ contact_links:
     - name: 🚨 Report a security or privacy issue
       url: https://hackerone.com/nextcloud
       about: Report security and privacy related issues privately to the Nextcloud team, so we can coordinate the fix and release without potentially exposing all Nextcloud servers and users in the meantime.
+    -   name: 🚨 报告安全或隐私问题
+        url: https://hackerone.com/nextcloud
+        about: 请以私密方式向 Nextcloud 团队报告安全和隐私相关问题，以便我们能够协调修复工作并安排发布计划，避免在此期间可能暴露所有 Nextcloud 服务器和用户的风险。
     - name: ❓ Community Support and Help
       url: https://help.nextcloud.com/
       about: Configuration, webserver/proxy or performance issues and other questions

.github/workflows/codeql.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
         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@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16

.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@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
         with:
           sarif_file: results.sarif

.github/workflows/unit-tests.yml

@@ -42,7 +42,7 @@ jobs:
                     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                 run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "test" "Unit" ${{github.event.number}}
             -   name: Upload coverage to codecov
-                uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
+                uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
                 with:
                     token: ${{ secrets.CODECOV_TOKEN }}
                     flags: unit

app/build.gradle

@@ -326,7 +326,7 @@ dependencies {
     implementation "com.googlecode.ez-vcard:ez-vcard:0.12.1"
     implementation "org.lukhnos:nnio:0.3.1"
     implementation "org.bouncycastle:bcpkix-jdk18on:1.80"
-    implementation "com.google.code.gson:gson:2.12.1"
+    implementation "com.google.code.gson:gson:2.13.1"
     implementation "com.github.nextcloud-deps:sectioned-recyclerview:0.6.1"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.29"
@@ -345,7 +345,7 @@ dependencies {
     huaweiImplementation project(":appscan")
     qaImplementation project(":appscan")
 
-    spotbugsPlugins "com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0"
+    spotbugsPlugins "com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0"
     spotbugsPlugins "com.mebigfatguy.fb-contrib:fb-contrib:7.6.9"
 
     implementation "com.google.dagger:dagger:$daggerVersion"
@@ -425,7 +425,7 @@ dependencies {
     implementation "com.github.stateless4j:stateless4j:2.6.0"
 
     // upon each update first test: new registration, receive push
-    gplayImplementation "com.google.firebase:firebase-messaging:24.1.0"
+    gplayImplementation "com.google.firebase:firebase-messaging:24.1.1"
     gplayImplementation "com.google.android.gms:play-services-base:18.5.0"
     gplayImplementation "com.google.android.play:review-ktx:2.0.2"
 

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

@@ -254,19 +254,12 @@ protected static File getDummyFile(String name) throws IOException {
             file.mkdirs();
             return file;
         } else {
-            switch (name) {
-                case "empty.txt":
-                    return createFile("empty.txt", 0);
-
-                case "nonEmpty.txt":
-                    return createFile("nonEmpty.txt", 100);
-
-                case "chunkedFile.txt":
-                    return createFile("chunkedFile.txt", 500000);
-
-                default:
-                    return createFile(name, 0);
-            }
+            return switch (name) {
+                case "empty.txt" -> createFile("empty.txt", 0);
+                case "nonEmpty.txt" -> createFile("nonEmpty.txt", 100);
+                case "chunkedFile.txt" -> createFile("chunkedFile.txt", 500000);
+                default -> createFile(name, 0);
+            };
         }
     }
 

app/src/main/java/com/nextcloud/client/jobs/OfflineSyncWork.kt

@@ -28,7 +28,7 @@ import com.owncloud.android.utils.FileStorageUtils
 import java.io.File
 
 @Suppress("LongParameterList") // Legacy code
-class OfflineSyncWork constructor(
+class OfflineSyncWork(
     private val context: Context,
     params: WorkerParameters,
     private val contentResolver: ContentResolver,
@@ -65,7 +65,7 @@ class OfflineSyncWork constructor(
             return
         }
 
-        val updatedEtag = checkEtagChanged(folderName, storageManager, user) ?: return
+        val updatedEtag = checkETagChanged(folderName, storageManager, user) ?: return
 
         // iterate over downloaded files
         val files = folder.listFiles { obj: File -> obj.isFile }
@@ -102,41 +102,39 @@ class OfflineSyncWork constructor(
     }
 
     /**
-     * @return new etag if changed, `null` otherwise
+     * @return new eTag if changed, `null` otherwise
      */
-    private fun checkEtagChanged(folderName: String, storageManager: FileDataStorageManager, user: User): String? {
-        val ocFolder = storageManager.getFileByPath(folderName) ?: return null
+    private fun checkETagChanged(folderName: String, storageManager: FileDataStorageManager, user: User): String? {
+        val folder = storageManager.getFileByEncryptedRemotePath(folderName) ?: return null
 
-        Log_OC.d(TAG, "$folderName: currentEtag: ${ocFolder.etag}")
+        Log_OC.d(TAG, "$folderName: current eTag: ${folder.etag}")
 
         // check for etag change, if false, skip
-        val checkEtagOperation = CheckEtagRemoteOperation(
-            ocFolder.remotePath,
-            ocFolder.etagOnServer
-        )
-        val result = checkEtagOperation.execute(user, context)
+        val operation = CheckEtagRemoteOperation(folder.remotePath, folder.etagOnServer)
+        val result = operation.execute(user, context)
+
         return when (result.code) {
             ResultCode.ETAG_UNCHANGED -> {
                 Log_OC.d(TAG, "$folderName: eTag unchanged")
                 null
             }
             ResultCode.FILE_NOT_FOUND -> {
-                val removalResult = storageManager.removeFolder(ocFolder, true, true)
+                val removalResult = storageManager.removeFolder(folder, true, true)
                 if (!removalResult) {
-                    Log_OC.e(TAG, "removal of " + ocFolder.storagePath + " failed: file not found")
+                    Log_OC.e(TAG, "removal of " + folder.storagePath + " failed: file not found")
                 }
                 null
             }
             ResultCode.ETAG_CHANGED -> {
                 Log_OC.d(TAG, "$folderName: eTag changed")
-                result.data[0] as String
+                result?.data?.get(0) as? String
             }
             else -> if (connectivityService.isInternetWalled) {
                 Log_OC.d(TAG, "No connectivity, skipping sync")
                 null
             } else {
                 Log_OC.d(TAG, "$folderName: eTag changed")
-                result.data[0] as String
+                result?.data?.get(0) as? String
             }
         }
     }

app/src/main/java/com/nextcloud/utils/extensions/OCFileExtensions.kt

@@ -0,0 +1,33 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils.extensions
+
+import com.owncloud.android.MainApp
+import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.utils.FileStorageUtils
+
+fun List<OCFile>.filterFilenames(): List<OCFile> = distinctBy { it.fileName }
+
+fun List<OCFile>.filterTempFilter(): List<OCFile> = filterNot { it.isTempFile() }
+
+fun OCFile.isTempFile(): Boolean {
+    val context = MainApp.getAppContext()
+    val appTempPath = FileStorageUtils.getAppTempDirectoryPath(context)
+    return storagePath?.startsWith(appTempPath) == true
+}
+
+fun List<OCFile>.filterHiddenFiles(): List<OCFile> = filterNot { it.isHidden }.distinct()
+
+fun List<OCFile>.filterByMimeType(mimeType: String): List<OCFile> =
+    filter { it.isFolder || it.mimeType.startsWith(mimeType) }
+
+fun List<OCFile>.limitToPersonalFiles(userId: String): List<OCFile> = filter { file ->
+    file.ownerId?.let { ownerId ->
+        ownerId == userId && !file.isSharedWithMe && !file.isGroupFolder
+    } == true
+}

app/src/main/java/com/nextcloud/utils/extensions/StringExtensions.kt

@@ -32,6 +32,7 @@ object StringConstants {
     const val DOT = "."
     const val SPACE = " "
     const val THREE_DOT = "..."
+    const val TEMP = "tmp"
 }
 
 fun String.getContentOfPublicKey(): String {