Merge remote-tracking branch 'origin/master' into dev

.github/workflows/codeql.yml

@@ -39,7 +39,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3
+        uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -53,4 +53,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@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3
+        uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4

.github/workflows/reuse.yml

@@ -19,4 +19,4 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0
+        uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0

.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@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           sarif_file: results.sarif

app/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -301,6 +301,8 @@ public class SynchronizeFileOperation extends SyncOperation {
     }
 
     private void requestForDownload(OCFile file) {
+        final var fileDownloadHelper = FileDownloadHelper.Companion.instance();
+        
         if (syncInBackgroundWorker) {
             Log_OC.d("InternalTwoWaySyncWork", "download file: " + file.getFileName());
 
@@ -313,6 +315,7 @@ public class SynchronizeFileOperation extends SyncOperation {
                 String filename = file.getFileName();
                 if (filename != null) {
                     if (result.isSuccess()) {
+                        fileDownloadHelper.saveFile(file, operation, getStorageManager());
                         Log_OC.d(TAG, "requestForDownload completed for: " + file.getFileName());
                     } else {
                         Log_OC.d(TAG, "requestForDownload failed for: " + file.getFileName());
@@ -322,7 +325,7 @@ public class SynchronizeFileOperation extends SyncOperation {
                 Log_OC.d(TAG, "Exception caught at requestForDownload" + e);
             }
         } else {
-            FileDownloadHelper.Companion.instance().downloadFile(mUser, file);
+            fileDownloadHelper.downloadFile(mUser, file);
         }
     }
 

app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -446,6 +446,8 @@ public class SynchronizeFolderOperation extends SyncOperation {
     }
 
     private void startDirectDownloads() {
+        final var fileDownloadHelper = FileDownloadHelper.Companion.instance();
+        
         if (syncInBackgroundWorker) {
             try {
                 for (OCFile file: mFilesForDirectDownload) {
@@ -468,6 +470,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
                     }
 
                     if (result.isSuccess()) {
+                        fileDownloadHelper.saveFile(file, operation, getStorageManager());
                         Log_OC.d(TAG, "startDirectDownloads completed for: " + file.getFileName());
                     } else {
                         Log_OC.d(TAG, "startDirectDownloads failed for: " + file.getFileName());
@@ -477,7 +480,6 @@ public class SynchronizeFolderOperation extends SyncOperation {
                 Log_OC.d(TAG, "Exception caught at startDirectDownloads" + e);
             }
         } else {
-            final var fileDownloadHelper = FileDownloadHelper.Companion.instance();
             mFilesForDirectDownload.forEach(file -> fileDownloadHelper.downloadFile(user, file));
         }
     }

app/src/main/res/values-b+en+001/strings.xml

@@ -737,6 +737,7 @@
     <string name="request_account_deletion">Request account deletion</string>
     <string name="request_account_deletion_button">Request deletion</string>
     <string name="request_account_deletion_details">Request permanent deletion of account by service provider</string>
+    <string name="resharing_is_not_allowed">Policy or permissions prevent resharing</string>
     <string name="resized_image_not_possible_download">No resized image available. Download full image?</string>
     <string name="restore">Restore file</string>
     <string name="restore_backup">Restore backup</string>

app/src/main/res/values-de/strings.xml

@@ -737,6 +737,7 @@
     <string name="request_account_deletion">Kontolöschung anfordern</string>
     <string name="request_account_deletion_button">Löschung anfordern</string>
     <string name="request_account_deletion_details">Beim Diensteanbieter die dauerhafte Löschung des Kontos anfordern</string>
+    <string name="resharing_is_not_allowed">Richtlinien oder Berechtigungen verhindern das Weiterteilen</string>
     <string name="resized_image_not_possible_download">Kein verkleinertes Bild verfügbar. Vollbild herunterladen?</string>
     <string name="restore">Datei wiederherstellen</string>
     <string name="restore_backup">Letzte Sicherung wiederherstellen</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -694,7 +694,9 @@
     <string name="prefs_synced_folders_local_path_title">Pasta local</string>
     <string name="prefs_synced_folders_remote_path_title">Pasta remota</string>
     <string name="prefs_theme_title">Tema</string>
+    <string name="prefs_two_way_sync_interval">Intervalo</string>
     <string name="prefs_two_way_sync_summary">Gerencie pastas internas para sincronização bidirecional</string>
+    <string name="prefs_two_way_sync_switch_title">Ativar sincronização bidirecional</string>
     <string name="prefs_value_theme_dark">Escuro</string>
     <string name="prefs_value_theme_light">Claro</string>
     <string name="prefs_value_theme_system">Seguir o sistema</string>
@@ -735,6 +737,7 @@
     <string name="request_account_deletion">Solicitar a exclusão da conta</string>
     <string name="request_account_deletion_button">Solicitar exclusão</string>
     <string name="request_account_deletion_details">Solicitar exclusão permanente da conta pelo provedor de serviços</string>
+    <string name="resharing_is_not_allowed">Política ou permissões impedem o compartilhamento</string>
     <string name="resized_image_not_possible_download">Não há imagem redimensionada disponível. Baixar a imagem completa?</string>
     <string name="restore">Restaurar arquivo</string>
     <string name="restore_backup">Restaurar backup</string>
@@ -1059,11 +1062,22 @@
     <string name="whats_new_skip">Saltar</string>
     <string name="whats_new_title">Novo em %1$s</string>
     <string name="whats_your_status">Qual é o seu status?</string>
+    <string name="widgets_not_available">Os widgets estão disponíveis apenas em %1$s 25 ou posterior quando o aplicativo Dashboard está ativado</string>
     <string name="widgets_not_available_title">Indisponível</string>
     <string name="worker_download">Baixando arquivos…</string>
     <string name="write_email">Enviar e-mail</string>
     <string name="wrong_storage_path">A pasta de armazenamento de dados não existe!</string>
     <string name="wrong_storage_path_desc">Isto pode ser decorrente de uma restauração de backup em outro dispositivo. Retornando ao padrão. Verifique as configurações para ajustar a pasta de armazenamento.</string>
+    <plurals name="hours">
+        <item quantity="one">%d horas</item>
+        <item quantity="many">%d horas</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minutos</item>
+        <item quantity="many">%d minutos</item>
+        <item quantity="other">%d ata</item>
+    </plurals>
     <plurals name="sync_fail_in_favourites_content">
         <item quantity="one">Erro ao sincronizar %1$d arquivo (conflitos: %2$d)</item>
         <item quantity="many">Erro ao sincronizar %1$d arquivos (conflitos: %2$d)</item>

app/src/main/res/values-sv/strings.xml

@@ -738,6 +738,7 @@
     <string name="request_account_deletion">Begär att radera ditt konto</string>
     <string name="request_account_deletion_button">Begäran om radering</string>
     <string name="request_account_deletion_details">Begär permanent borttagning av konto av tjänsteleverantör</string>
+    <string name="resharing_is_not_allowed">Policy eller behörigheter förhindrar vidaredelning</string>
     <string name="resized_image_not_possible_download">Ingen storleksändrad bild tillgänglig. Hämta hela bilden?</string>
     <string name="restore">Återställ fil</string>
     <string name="restore_backup">Återställ säkerhetskopiering</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -737,6 +737,7 @@
     <string name="request_account_deletion">請求帳戶刪除</string>
     <string name="request_account_deletion_button">請求刪除</string>
     <string name="request_account_deletion_details">請求服務提供者永久刪除帳戶</string>
+    <string name="resharing_is_not_allowed">策略或權限阻止了重新分享。</string>
     <string name="resized_image_not_possible_download">沒有可用調整過的圖像，下載完整圖像？</string>
     <string name="restore">復原檔案</string>
     <string name="restore_backup">復原備份</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -737,6 +737,7 @@
     <string name="request_account_deletion">請求刪除帳號</string>
     <string name="request_account_deletion_button">請求刪除</string>
     <string name="request_account_deletion_details">請求服務提供者永久刪除帳號</string>
+    <string name="resharing_is_not_allowed">政策或權限阻止了轉分享</string>
     <string name="resized_image_not_possible_download">沒有調整過大小的圖片可用。是否下載完整圖片？</string>
     <string name="restore">復原檔案</string>
     <string name="restore_backup">復原備份</string>