Sync with master

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -171,7 +171,6 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
     public static final String RESTART = "RESTART";
     public static final String ALL_FILES = "ALL_FILES";
     public static final String LIST_GROUPFOLDERS = "LIST_GROUPFOLDERS";
-    public static final String PHOTO_SEARCH = "PHOTO_SEARCH";
     public static final int SINGLE_USER_SIZE = 1;
     public static final String OPEN_FILE = "NC_OPEN_FILE";
 
@@ -205,7 +204,6 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
     public static final int REQUEST_CODE__SELECT_FILES_FROM_FILE_SYSTEM = REQUEST_CODE__LAST_SHARED + 2;
     public static final int REQUEST_CODE__MOVE_OR_COPY_FILES = REQUEST_CODE__LAST_SHARED + 3;
     public static final int REQUEST_CODE__UPLOAD_FROM_CAMERA = REQUEST_CODE__LAST_SHARED + 5;
-    public static final int REQUEST_CODE__UPLOAD_SCAN_DOC_FROM_CAMERA = REQUEST_CODE__LAST_SHARED + 6;
 
     protected static final long DELAY_TO_REQUEST_REFRESH_OPERATION_LATER = DELAY_TO_REQUEST_OPERATIONS_LATER + 350;
 
@@ -899,24 +897,11 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
                 remotePaths[j] = remotePathBase + relativePath;
             }
 
-            int behaviour;
-            switch (resultCode) {
-                case UploadFilesActivity.RESULT_OK_AND_MOVE:
-                    behaviour = FileUploader.LOCAL_BEHAVIOUR_MOVE;
-                    break;
-
-                case UploadFilesActivity.RESULT_OK_AND_DELETE:
-                    behaviour = FileUploader.LOCAL_BEHAVIOUR_DELETE;
-                    break;
-
-                case UploadFilesActivity.RESULT_OK_AND_DO_NOTHING:
-                    behaviour = FileUploader.LOCAL_BEHAVIOUR_FORGET;
-                    break;
-
-                default:
-                    behaviour = FileUploader.LOCAL_BEHAVIOUR_FORGET;
-                    break;
-            }
+            int behaviour = switch (resultCode) {
+                case UploadFilesActivity.RESULT_OK_AND_MOVE -> FileUploader.LOCAL_BEHAVIOUR_MOVE;
+                case UploadFilesActivity.RESULT_OK_AND_DELETE -> FileUploader.LOCAL_BEHAVIOUR_DELETE;
+                default -> FileUploader.LOCAL_BEHAVIOUR_FORGET;
+            };
 
             FileUploader.uploadNewFile(this, getUser().orElseThrow(RuntimeException::new), filePaths, remotePaths, null,           // MIME type will be detected from file name
                                        behaviour, true, UploadFileOperation.CREATED_BY_USER, false, false, NameCollisionPolicy.ASK_USER);
@@ -1392,7 +1377,7 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
                 if (uploadWasFine) {
                     OCFile ocFile = getFile();
                     if (PreviewImageFragment.canBePreviewed(ocFile)) {
-                        startImagePreview(getFile(), true);
+                        startImagePreview(getFile(),true);
                     } else if (PreviewTextFileFragment.canBePreviewed(ocFile)) {
                         startTextPreview(ocFile, true);
                     }
@@ -2002,11 +1987,6 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
         requestForDownload(mWaitingToSend, downloadBehaviour, packageName, activityName);
     }
 
-    /**
-     * Opens the image gallery showing the image {@link OCFile} received as parameter.
-     *
-     * @param file Image {@link OCFile} to show.
-     */
     public void startImagePreview(OCFile file, boolean showPreview) {
         Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);
         showDetailsIntent.putExtra(EXTRA_FILE, file);
@@ -2020,22 +2000,20 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
         }
     }
 
-    /**
-     * Opens the image gallery showing the image {@link OCFile} received as parameter.
-     *
-     * @param file Image {@link OCFile} to show.
-     */
     public void startImagePreview(OCFile file, VirtualFolderType type, boolean showPreview) {
         Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);
         showDetailsIntent.putExtra(PreviewImageActivity.EXTRA_FILE, file);
-
+        showDetailsIntent.putExtra(EXTRA_LIVE_PHOTO_FILE, file.livePhotoVideo);
         showDetailsIntent.putExtra(EXTRA_USER, getUser().orElseThrow(RuntimeException::new));
         showDetailsIntent.putExtra(PreviewImageActivity.EXTRA_VIRTUAL_TYPE, type);
 
         if (showPreview) {
             startActivity(showDetailsIntent);
         } else {
-            FileOperationsHelper fileOperationsHelper = new FileOperationsHelper(this, getUserAccountManager(), connectivityService, editorUtils);
+            FileOperationsHelper fileOperationsHelper = new FileOperationsHelper(this,
+                                                                                 getUserAccountManager(),
+                                                                                 connectivityService,
+                                                                                 editorUtils);
             fileOperationsHelper.startSyncForFileAndIntent(file, showDetailsIntent);
         }
     }
@@ -2464,7 +2442,7 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
         binding.fabMain.setVisibility(visibility);
     }
 
-    public void showFile(String message) {
+    public void showFile(OCFile selectedFile, String message) {
         dismissLoadingDialog();
 
         OCFileListFragment listOfFiles = getOCFileListFragmentFromFile();
@@ -2477,6 +2455,10 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
         } else {
             DisplayUtils.showSnackMessage(listOfFiles.getView(), message);
         }
+
+        if (selectedFile != null) {
+            listOfFiles.onItemClicked(selectedFile);
+        }
     }
 
     /**

app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java

@@ -43,6 +43,7 @@ public class FetchRemoteFileTask extends AsyncTask<Void, Void, String> {
     private final String fileId;
     private final FileDataStorageManager storageManager;
     private final FileDisplayActivity fileDisplayActivity;
+    private OCFile ocFile;
 
     public FetchRemoteFileTask(User user,
                                String fileId,
@@ -84,7 +85,7 @@ public class FetchRemoteFileTask extends AsyncTask<Void, Void, String> {
 
             RemoteFile remoteFile = (RemoteFile) result.getData().get(0);
 
-            OCFile ocFile = FileStorageUtils.fillOCFile(remoteFile);
+            ocFile = FileStorageUtils.fillOCFile(remoteFile);
             FileStorageUtils.searchForLocalFileInDefaultPath(ocFile, user.getAccountName());
             ocFile = storageManager.saveFileWithParent(ocFile, fileDisplayActivity);
 
@@ -118,6 +119,6 @@ public class FetchRemoteFileTask extends AsyncTask<Void, Void, String> {
     protected void onPostExecute(String message) {
         super.onPostExecute(message);
 
-        fileDisplayActivity.showFile(message);
+        fileDisplayActivity.showFile(ocFile, message);
     }
 }

app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

@@ -227,7 +227,7 @@ class UnifiedSearchFragment :
                 if (showFileActions) {
                     fda.showFileActions(file)
                 } else {
-                    fda.showFile("")
+                    fda.showFile(file, "")
                 }
             }
         }

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

@@ -337,6 +337,7 @@
     <string name="file_list_empty_shared_headline">Aucun partage</string>
     <string name="file_list_empty_unified_search_no_results">Aucun résultat trouvé pour votre requête</string>
     <string name="file_list_folder">dossier</string>
+    <string name="file_list_live">EN DIRECT</string>
     <string name="file_list_loading">Chargement…</string>
     <string name="file_list_no_app_for_file_type">Aucune application trouvée pour ce type de fichier.</string>
     <string name="file_list_seconds_ago">à l\'instant</string>
@@ -649,6 +650,7 @@
     <string name="rename_local_fail_msg">Impossible de renommer la version locale; veuillez réessayer avec un nom différent</string>
     <string name="rename_server_fail_msg">Impossible de renommer, le nom est déjà utilisé</string>
     <string name="request_account_deletion">Demander la suppression du compte</string>
+    <string name="request_account_deletion_button">Demander la suppression</string>
     <string name="reshare_not_allowed">Le repartage n\'est pas autorisé</string>
     <string name="resharing_is_not_allowed">Le repartage est interdit</string>
     <string name="resized_image_not_possible_download">Aucune image réduite disponible. Télécharger l\'image originale ?</string>

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

@@ -10,6 +10,7 @@
     <string name="action_clear_failed_uploads">Notīrīt neizdevušās augšupielādes</string>
     <string name="action_edit">Rediģēt</string>
     <string name="action_empty_notifications">Notīrīt visus paziņojumus</string>
+    <string name="action_empty_trashbin">Izdzēst miskastes saturu</string>
     <string name="action_send_share">Sūtīt/Kopīgot</string>
     <string name="action_switch_grid_view">Režģa izkārtojums</string>
     <string name="action_switch_list_view">Saraksta izkārtojums</string>
@@ -436,6 +437,7 @@
     <string name="status_message">Statusa ziņojums</string>
     <string name="storage_description_default">Noklusējuma</string>
     <string name="storage_downloads">Lejupielādes</string>
+    <string name="sub_folder_rule_year">Gads</string>
     <string name="subject_shared_with_you">\"%1$s\" ir bijis kopīgots ar jums</string>
     <string name="subject_user_shared_with_you">%1$s koplietots \"%2$s\" ar tevi</string>
     <string name="sync_conflicts_in_favourites_ticker">Ir atrasti konflikti</string>

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

@@ -16,6 +16,7 @@
     <string name="action_switch_list_view">Lista de visualização</string>
     <string name="actionbar_calendar_contacts_restore">Restaurar contatos &amp; calendário</string>
     <string name="actionbar_mkdir">Nova pasta</string>
+    <string name="actionbar_move_or_copy">Mover ou Copiar</string>
     <string name="actionbar_open_with">Abrir com</string>
     <string name="actionbar_search">Pesquisar</string>
     <string name="actionbar_see_details">Detalhes</string>
@@ -155,6 +156,7 @@
     <string name="conflict_message_description">Se você selecionar as duas versões, o arquivo local terá um número anexado ao seu nome.</string>
     <string name="conflict_server_file">Arquivo do servidor</string>
     <string name="contact_backup_title">Backup de contatos</string>
+    <string name="contact_no_permission">É necessária permissão de contato.</string>
     <string name="contactlist_item_icon">Ícone de usuário para a lista de contatos</string>
     <string name="contactlist_no_permission">Nenhuma permissão fornecida, nada foi importado.</string>
     <string name="contacts">Contatos</string>
@@ -251,6 +253,7 @@
     <string name="ecosystem_apps_more">Mais aplicativos Nextcloud</string>
     <string name="ecosystem_apps_notes">Notas Nextcloud</string>
     <string name="ecosystem_apps_talk">Nextcloud Talk</string>
+    <string name="email_pick_failed">Falha ao escolher o endereço de e-mail.</string>
     <string name="encrypted">Definir como criptografado</string>
     <string name="end_to_end_encryption_confirm_button">Definir criptografia</string>
     <string name="end_to_end_encryption_decrypting">Descriptografando…</string>
@@ -335,6 +338,7 @@
     <string name="file_list_empty_shared_headline">Você ainda não compartilhou nada!</string>
     <string name="file_list_empty_unified_search_no_results">Nenhum resultado encontrado para sua consulta</string>
     <string name="file_list_folder">pasta</string>
+    <string name="file_list_live">AO VIVO</string>
     <string name="file_list_loading">Carregando…</string>
     <string name="file_list_no_app_for_file_type">Nenhuma aplicação definida para manipular este tipo de arquivo.</string>
     <string name="file_list_seconds_ago">segundos atrás</string>
@@ -638,6 +642,8 @@
     <string name="remove_e2e">Você pode remover a criptografia de ponta a ponta localmente neste cliente</string>
     <string name="remove_e2e_message">Você pode remover a criptografia de ponta a ponta localmente neste cliente. Os arquivos criptografados permanecerão no servidor, mas não será mais sincronizado com este computador.</string>
     <string name="remove_fail_msg">Falha na exclusão</string>
+    <string name="remove_local_account">Remover conta local</string>
+    <string name="remove_local_account_details">Remova a conta do dispositivo e exclua todos os arquivos locais</string>
     <string name="remove_notification_failed">Erro ao remover a notificação.</string>
     <string name="remove_push_notification">Remover</string>
     <string name="remove_success_msg">Excluído</string>
@@ -645,6 +651,8 @@
     <string name="rename_local_fail_msg">Não foi possível renomear a cópia local, tente um nome diferente</string>
     <string name="rename_server_fail_msg">Não foi possível renomear pois o nome já existe</string>
     <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="reshare_not_allowed">Recompartilhamento não é permitido</string>
     <string name="resharing_is_not_allowed">Recompartilhamento não é permitido</string>
     <string name="resized_image_not_possible_download">Não há imagem redimensionada disponível. Baixar a imagem completa?</string>
@@ -861,6 +869,7 @@
     <string name="upload_lock_failed">Falha ao bloquear pasta</string>
     <string name="upload_old_android">A criptografia só é possível com Android &gt;= 5.0</string>
     <string name="upload_query_move_foreign_files">O espaço insuficiente está impedindo a cópia dos arquivos selecionados para a pasta %1$s. Em vez de copiá-los, gostaria de movê-los para lá?</string>
+    <string name="upload_quota_exceeded">Cota de armazenamento excedida</string>
     <string name="upload_scan_doc_upload">Digitalizar documento da câmera</string>
     <string name="upload_sync_conflict">Conflito na sincronização, resolva manualmente</string>
     <string name="upload_unknown_error">Erro desconhecido</string>
@@ -872,7 +881,10 @@
     <string name="uploader_error_message_source_file_not_found">O arquivo selecionado para envio não foi encontrado. Verifique se ele existe.</string>
     <string name="uploader_error_title_file_cannot_be_uploaded">Este arquivo não pode ser enviado</string>
     <string name="uploader_error_title_no_file_to_upload">Nenhum arquivo para envio</string>
+    <string name="uploader_file_not_found_message">Arquivo não encontrado. Tem certeza de que este arquivo existe ou o conflito não foi resolvido antes?</string>
+    <string name="uploader_file_not_found_on_server_message">Não conseguimos localizar o arquivo no servidor. Outro usuário pode ter excluído o arquivo</string>
     <string name="uploader_info_dirname">Nome da pasta</string>
+    <string name="uploader_local_files_uploaded">Tente fazer upload dos arquivos locais novamente</string>
     <string name="uploader_top_message">Escolher pasta para envio</string>
     <string name="uploader_upload_failed_content_single">Não foi possível enviar %1$s</string>
     <string name="uploader_upload_failed_credentials_error">Envio falhou. Logue-se novamente</string>
@@ -929,7 +941,9 @@
     <string name="wait_a_moment">Aguarde um momento…</string>
     <string name="wait_checking_credentials">Verificando credenciais salvas</string>
     <string name="wait_for_tmp_copy_from_private_storage">Copiando o arquivo da armazenagem privada</string>
+    <string name="webview_version_check_alert_dialog_message">Atualize o aplicativo Android System WebView para fazer login</string>
     <string name="webview_version_check_alert_dialog_positive_button_title">Atualizar</string>
+    <string name="webview_version_check_alert_dialog_title">Atualizar WebView do sistema Android</string>
     <string name="what_s_new_image">Imagem nova</string>
     <string name="whats_new_skip">Saltar</string>
     <string name="whats_new_title">Novo em %1$s</string>