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

nextcloud · Nov 19, 2024 · e2cc11c · e2cc11c
2 parents 7909c8c + a930296
commit e2cc11c
Show file tree

Hide file tree

Showing 53 changed files with 85 additions and 142 deletions.
diff --git a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt
@@ -711,7 +711,9 @@ internal class BackgroundJobManagerImpl(
             jobClass = InternalTwoWaySyncWork::class,
             jobName = JOB_INTERNAL_TWO_WAY_SYNC,
             intervalMins = intervalMinutes
-        ).build()
+        )
+            .setInitialDelay(intervalMinutes, TimeUnit.MINUTES)
+            .build()
 
         workManager.enqueueUniquePeriodicWork(JOB_INTERNAL_TWO_WAY_SYNC, ExistingPeriodicWorkPolicy.UPDATE, request)
     }

diff --git a/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -138,7 +138,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                 }
 
                 if (result.isSuccess()) {
-                    syncContents();
+                    syncContents(client);
                 }
             }
 
@@ -440,9 +440,29 @@ private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
         }
     }
 
-    private void syncContents() throws OperationCancelledException {
+    private void syncContents(OwnCloudClient client) throws OperationCancelledException {
         startDirectDownloads();
         startContentSynchronizations(mFilesToSyncContents);
+        updateETag(client);
+    }
+
+    /**
+     * Updates the eTag of the local folder after a successful synchronization.
+     * This ensures that any changes to local files, which may alter the eTag, are correctly reflected.
+     *
+     * @param client the OwnCloudClient instance used to execute remote operations.
+     */
+    private void updateETag(OwnCloudClient client) {
+        ReadFolderRemoteOperation operation = new ReadFolderRemoteOperation(mRemotePath);
+        final var result = operation.execute(client);
+
+        if (result.getData().get(0) instanceof RemoteFile remoteFile) {
+            String eTag = remoteFile.getEtag();
+            mLocalFolder.setEtag(eTag);
+
+            final FileDataStorageManager storageManager = getStorageManager();
+            storageManager.saveFile(mLocalFolder);
+        }
     }
 
     private void startDirectDownloads() {

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -35,7 +35,6 @@
     <string name="advanced_settings">الإعدادات المتقدمة</string>
     <string name="allow_resharing">السماح بإعادة المشاركة </string>
     <string name="app_config_base_url_title">عنوان URL الأساسي</string>
-    <string name="app_config_proxy_host_title">اسم المضيف الوكيل</string>
     <string name="app_config_proxy_port_title">منفذ البروكسي</string>
     <string name="app_widget_description">عرض أداة واحدة من لوحة القيادة</string>
     <string name="appbar_search_in">بحث في %s</string>
@@ -56,7 +55,6 @@
     <string name="assistant_screen_task_delete_success_message">تمّ حذف المهمة بنجاح</string>
     <string name="assistant_screen_task_list_error_state_message">تعذّر جلب قائمة المهام. قم رجاءً بالتحقُّق من اتصالك بالإنترنت.</string>
     <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">حذف مهمة</string>
-    <string name="assistant_screen_task_output_empty_text">مخرجات المهمة ليست جاهزة حتى الآن.</string>
     <string name="assistant_screen_task_types_error_state_message">تعذّر جلب أنواع المهام. قم رجاءً بالتحقُّق من اتصالك بالإنترنت.</string>
     <string name="assistant_screen_top_bar_title">المُساعِد</string>
     <string name="assistant_screen_unknown_task_status_text">غير معروف</string>
@@ -767,7 +765,6 @@
     <string name="screenshot_06_davdroid_subline">مزامنة مع DAVx5</string>
     <string name="search_error">خطاء في الحصول على نتائج البحث</string>
     <string name="secure_share_not_set_up">المشاركة الآمنة لم يتم إعدادها بالنسبة لهذا المستخدِم</string>
-    <string name="secure_share_search">المشاركة الآمنة ...</string>
     <string name="select_all">تحديد الكل</string>
     <string name="select_media_folder">تعيين مجلد الوسائط</string>
     <string name="select_one_template">الرجاء تحديد قالب واحد</string>
@@ -811,7 +808,6 @@
     <string name="share_permissions">صلاحيات المشاركة</string>
     <string name="share_remote_clarification">%1$s (بعيد)</string>
     <string name="share_room_clarification">%1$s (محادثة)</string>
-    <string name="share_search">الاسم , معرف السحابة , أو البريد الالكتروني ...</string>
     <string name="share_send_new_email">إرسال بريد جديد</string>
     <string name="share_send_note">ملاحظة للمستلم</string>
     <string name="share_settings">الإعدادات</string>

diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
@@ -35,7 +35,6 @@
     <string name="advanced_settings">Advanced Settings</string>
     <string name="allow_resharing">Allow resharing</string>
     <string name="app_config_base_url_title">Base URL</string>
-    <string name="app_config_proxy_host_title">Proxy Host Name</string>
     <string name="app_config_proxy_port_title">Proxy Port</string>
     <string name="app_widget_description">Shows one widget from dashboard</string>
     <string name="appbar_search_in">Search in %s</string>
@@ -56,7 +55,6 @@
     <string name="assistant_screen_task_delete_success_message">Task successfully deleted</string>
     <string name="assistant_screen_task_list_error_state_message">Unable to fetch task list, please check your internet connection.</string>
     <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Delete Task</string>
-    <string name="assistant_screen_task_output_empty_text">The task output isn’t ready yet.</string>
     <string name="assistant_screen_task_types_error_state_message">Unable to fetch task types, please check your internet connection.</string>
     <string name="assistant_screen_top_bar_title">Assistant</string>
     <string name="assistant_screen_unknown_task_status_text">Unknown</string>
@@ -762,7 +760,6 @@
     <string name="screenshot_06_davdroid_subline">Sync with DAVx5</string>
     <string name="search_error">Error getting search results</string>
     <string name="secure_share_not_set_up">Secure sharing is not set up for this user</string>
-    <string name="secure_share_search">Secure share …</string>
     <string name="select_all">Select all</string>
     <string name="select_media_folder">Set media folder</string>
     <string name="select_one_template">Please select one template</string>
@@ -806,7 +803,6 @@
     <string name="share_permissions">Share Permissions</string>
     <string name="share_remote_clarification">%1$s (remote)</string>
     <string name="share_room_clarification">%1$s (conversation)</string>
-    <string name="share_search">Name, Federated Cloud ID or email address …</string>
     <string name="share_send_new_email">Send new email</string>
     <string name="share_send_note">Note to recipient</string>
     <string name="share_settings">Settings</string>

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
@@ -679,7 +679,6 @@
     <string name="share_permissions">Права за споделяне</string>
     <string name="share_remote_clarification">%1$s (отдалечен)</string>
     <string name="share_room_clarification">%1$s (разговор)</string>
-    <string name="share_search">Име, Федериран/обединен/ облачен идентификатор или имейл адрес ...</string>
     <string name="share_send_new_email">Изпращане на нов имейл</string>
     <string name="share_send_note">Бележка за получателя</string>
     <string name="share_settings">Настройки</string>

diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Ouzhpennañ da %1$s</string>
     <string name="advanced_settings">Arventennoù araokaet</string>
     <string name="allow_resharing">Aotren rannañ pelloc\'h</string>
-    <string name="app_config_proxy_host_title">Anv Ostiz Proksi</string>
     <string name="app_config_proxy_port_title">Porzh Proksi</string>
     <string name="app_widget_description">Diskouez a ra ur widget dre daolenn-vourzh</string>
     <string name="appbar_search_in">Klask e %s</string>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -34,7 +34,6 @@
     <string name="advanced_settings">Paràmetres avançats</string>
     <string name="allow_resharing">Permet compartir de nou</string>
     <string name="app_config_base_url_title">URL base</string>
-    <string name="app_config_proxy_host_title">Nom del servidor intermediari</string>
     <string name="app_config_proxy_port_title">Port del proxy</string>
     <string name="app_widget_description">Mostra un giny del tauler</string>
     <string name="appbar_search_in">Cerca a %s</string>
@@ -55,7 +54,6 @@
     <string name="assistant_screen_task_delete_success_message">La tasca s\'ha suprimit correctament</string>
     <string name="assistant_screen_task_list_error_state_message">No s\'ha pogut obtenir la llista de tasques. Comproveu la vostra connexió a Internet.</string>
     <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Suprimeix la tasca</string>
-    <string name="assistant_screen_task_output_empty_text">La sortida de la tasca encara no està llesta.</string>
     <string name="assistant_screen_task_types_error_state_message">No s\'han pogut obtenir els tipus de tasques. Comproveu la connexió a Internet.</string>
     <string name="assistant_screen_top_bar_title">Assistent</string>
     <string name="assistant_screen_unknown_task_status_text">Desconegut</string>
@@ -697,7 +695,6 @@
     <string name="share_permissions">Compartir permisos</string>
     <string name="share_remote_clarification">%1$s (remot)</string>
     <string name="share_room_clarification">%1$s(conversa)</string>
-    <string name="share_search">Nom, ID de núvol federat o adreça electrònic …</string>
     <string name="share_send_new_email">Envia un correu nou</string>
     <string name="share_send_note">Nota al destinatari</string>
     <string name="share_settings">Paràmetres</string>

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -35,7 +35,6 @@
     <string name="advanced_settings">Pokročilá nastavení</string>
     <string name="allow_resharing">Povolit sdílet dál dalším</string>
     <string name="app_config_base_url_title">Základní URL</string>
-    <string name="app_config_proxy_host_title">Název stroje s proxy</string>
     <string name="app_config_proxy_port_title">Port proxy</string>
     <string name="app_widget_description">Zobrazuje jeden ovládací prvek z nástěnky</string>
     <string name="appbar_search_in">Hledat v %s</string>
@@ -56,7 +55,6 @@
     <string name="assistant_screen_task_delete_success_message">Úloha úspěšně smazána</string>
     <string name="assistant_screen_task_list_error_state_message">Nedaří se získat seznam úloh – zkontrolujte připojení k Internetu.</string>
     <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Smazat úlohu</string>
-    <string name="assistant_screen_task_output_empty_text">Výstup z úkolu ještě není připraven.</string>
     <string name="assistant_screen_task_types_error_state_message">Nedaří se získat typy úloh – zkontrolujte připojení k Internetu.</string>
     <string name="assistant_screen_top_bar_title">Asistent</string>
     <string name="assistant_screen_unknown_task_status_text">Neznámé</string>
@@ -737,6 +735,7 @@
     <string name="request_account_deletion">Vyžádat smazání účtu</string>
     <string name="request_account_deletion_button">Vyžádat si smazání</string>
     <string name="request_account_deletion_details">Vyžádat si trvalé vymazání účtu u poskytovatele služby</string>
+    <string name="resharing_is_not_allowed">Zásada nebo oprávnění brání sdílení dál dalším</string>
     <string name="resized_image_not_possible_download">Zmenšená verze obrázku není k dispozici. Stáhnout obrázek v plné velikosti?</string>
     <string name="restore">Obnovit soubor</string>
     <string name="restore_backup">Obnovit ze zálohy</string>
@@ -761,7 +760,6 @@
     <string name="screenshot_06_davdroid_subline">Synchronizace s DAVx5</string>
     <string name="search_error">Chyba při získávání výsledků hledání</string>
     <string name="secure_share_not_set_up">Zabezpečené sdílení není pro tohoto uživatele nastaveno</string>
-    <string name="secure_share_search">Zabezpečené sdílení…</string>
     <string name="select_all">Vybrat vše</string>
     <string name="select_media_folder">Nastavit složku s médii</string>
     <string name="select_one_template">Vyberte jednu šablonu</string>
@@ -805,7 +803,6 @@
     <string name="share_permissions">Oprávnění pro sdílení</string>
     <string name="share_remote_clarification">%1$s (vzdálený)</string>
     <string name="share_room_clarification">%1$s (konverzace)</string>
-    <string name="share_search">Jméno, identifikátor v rámci federovaného cloudu, nebo e-mailová adresa…</string>
     <string name="share_send_new_email">Odeslat nový e-mail</string>
     <string name="share_send_note">Poznámka pro příjemce</string>
     <string name="share_settings">Nastavení</string>
@@ -923,6 +920,9 @@
     <string name="trashbin_file_remove">Nevratně smazat</string>
     <string name="trashbin_loading_failed">Načítání obsahu koše se nezdařilo!</string>
     <string name="trashbin_not_emptied">Soubory se nepodařilo natrvalo smazat!</string>
+    <string name="two_way_sync_activity_disable_all_button_title">Vypnout pro všechny složky</string>
+    <string name="two_way_sync_activity_empty_list_desc">Pro nastavení složky pro obousměrnou synchronizaci, zapněte ji na kartě podrobností o dané složce.</string>
+    <string name="two_way_sync_activity_empty_list_title">Obousměrná synchronizace není nastavena</string>
     <string name="two_way_sync_activity_title">Interní obousměrná synchronizace</string>
     <string name="unexpected_error_occurred">Došlo k neočekávané chybě</string>
     <string name="unified_search_fragment_calendar_event_not_found">Událost nenalezena, ale ještě pořád je možné aktualizovat synchronizací. Přesměrovává se na web…</string>
@@ -932,6 +932,7 @@
     <string name="unread_comments">Existuje nepřečtený komentář</string>
     <string name="unset_encrypted">Zrušit šifrování</string>
     <string name="unset_favorite">Odebrat z oblíbených</string>
+    <string name="unset_internal_two_way_sync_description">Odebrat složku z interní obousměrné synchronizace</string>
     <string name="unshare_link_file_error">Při pokusu o zrušení sdílení tohoto souboru či složky došlo k chybě.</string>
     <string name="unshare_link_file_no_exist">Nedaří se zrušit sdílení – zkontrolujte zda soubor existuje.</string>
     <string name="unshare_link_forbidden_permissions">pro zrušení sdílení tohoto souboru</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -49,7 +49,6 @@
     <string name="assistant_screen_task_delete_fail_message">En fejl opstod under sletning af opgaven</string>
     <string name="assistant_screen_task_delete_success_message">Opgaven er slettet</string>
     <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Slet opgave</string>
-    <string name="assistant_screen_task_output_empty_text">Opgaveoutputtet er ikke klar endnu.</string>
     <string name="assistant_screen_top_bar_title">Assistent</string>
     <string name="assistant_screen_unknown_task_status_text">Ukendt</string>
     <string name="associated_account_not_found">Forbundet konto blev ikke fundet!</string>
@@ -737,7 +736,6 @@ Enheds legitimationsoplysninger er sat op
     <string name="share_permissions">Del Tilladelser</string>
     <string name="share_remote_clarification">%1$s (ekstern)</string>
     <string name="share_room_clarification">%1$s (samtale)</string>
-    <string name="share_search">Navn, Fødereret Cloud ID eller email adresse ...</string>
     <string name="share_send_new_email">Send ny email</string>
     <string name="share_send_note">Note til modtager</string>
     <string name="share_settings">Indstillinger</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -35,7 +35,6 @@
     <string name="advanced_settings">Erweiterte Einstellungen</string>
     <string name="allow_resharing">Weiterteilen erlauben</string>
     <string name="app_config_base_url_title">Basis-URL</string>
-    <string name="app_config_proxy_host_title">Proxy-Hostname</string>
     <string name="app_config_proxy_port_title">Proxy-Port</string>
     <string name="app_widget_description">Zeigt ein Widget aus dem Dashboard an</string>
     <string name="appbar_search_in">Suche in %s</string>
@@ -56,7 +55,6 @@
     <string name="assistant_screen_task_delete_success_message">Aufgabe gelöscht</string>
     <string name="assistant_screen_task_list_error_state_message">Die Aufgabenliste kann nicht abgerufen werden. Bitte überprüfen Sie Ihre Internetverbindung.</string>
     <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Aufgabe löschen</string>
-    <string name="assistant_screen_task_output_empty_text">Die Aufgabenausgabe ist noch nicht fertig.</string>
     <string name="assistant_screen_task_types_error_state_message">Die Aufgabentypen können nicht abgerufen werden. Bitte überprüfen Sie Ihre Internetverbindung.</string>
     <string name="assistant_screen_top_bar_title">Assistent</string>
     <string name="assistant_screen_unknown_task_status_text">Unbekannt</string>
@@ -762,7 +760,6 @@
     <string name="screenshot_06_davdroid_subline">Synchronisiere mit DAVx5</string>
     <string name="search_error">Fehler beim Abrufen der Suchergebnisse</string>
     <string name="secure_share_not_set_up">Sicheres teilen ist für diesen Benutzer nicht eingerichtet</string>
-    <string name="secure_share_search">Sicheres teilen …</string>
     <string name="select_all">Alle auswählen</string>
     <string name="select_media_folder">Medien-Ordner auswählen</string>
     <string name="select_one_template">Bitte eine Vorlage auswählen</string>
@@ -806,7 +803,6 @@
     <string name="share_permissions">Berechtigungen zum Teilen</string>
     <string name="share_remote_clarification">%1$s (remote)</string>
     <string name="share_room_clarification">%1$s (Unterhaltung)</string>
-    <string name="share_search">Name, Federated-Cloud-ID oder E-Mail-Adresse …</string>
     <string name="share_send_new_email">Neue E-Mail senden</string>
     <string name="share_send_note">Notiz an Empfänger</string>
     <string name="share_settings">Einstellungen</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -683,7 +683,6 @@
     <string name="share_permissions">Δικαιώματα κοινής χρήσης</string>
     <string name="share_remote_clarification">%1$s (απομακρυσμένα)</string>
     <string name="share_room_clarification">%1$s (συνομιλιία)</string>
-    <string name="share_search">Όνομα, Ομοσπονδιακό Cloud ID   ή διεύθυνση ηλεκτρονικού ταχυδρομείου...</string>
     <string name="share_send_new_email">Αποστολή νέου email</string>
     <string name="share_send_note">Σημείωση στον παραλήπτη</string>
     <string name="share_settings">Ρυθμίσεις</string>