mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 08:44:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tobias Kaminsky 2024-09-14 03:37:49 +02:00
commit 3486bd85b9
19 changed files with 36 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/codeql.yml vendored
View file

@ -39,7 +39,7 @@ jobs:
with:
swap-size-gb: 10
- name: Initialize CodeQL
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7

2
.github/workflows/scorecard.yml vendored
View file

@ -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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
with:
sarif_file: results.sarif

46
app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
View file

@ -543,35 +543,39 @@ public abstract class FileActivity extends DrawerActivity
public void showLoadingDialog(String message) {
dismissLoadingDialog();
FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);
if (fragment == null) {
Log_OC.d(TAG, "show loading dialog");
LoadingDialog loadingDialogFragment = LoadingDialog.newInstance(message);
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
boolean isDialogFragmentReady = ActivityExtensionsKt.isDialogFragmentReady(this, loadingDialogFragment);
if (isDialogFragmentReady) {
fragmentTransaction.add(loadingDialogFragment, DIALOG_WAIT_TAG);
fragmentTransaction.commitNow();
runOnUiThread(() -> {
FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);
if (fragment == null) {
Log_OC.d(TAG, "show loading dialog");
LoadingDialog loadingDialogFragment = LoadingDialog.newInstance(message);
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
boolean isDialogFragmentReady = ActivityExtensionsKt.isDialogFragmentReady(this, loadingDialogFragment);
if (isDialogFragmentReady) {
fragmentTransaction.add(loadingDialogFragment, DIALOG_WAIT_TAG);
fragmentTransaction.commitNow();
}
}
}
});
}
/**
* Dismiss loading dialog
*/
public void dismissLoadingDialog() {
FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);
if (fragment != null) {
Log_OC.d(TAG, "dismiss loading dialog");
LoadingDialog loadingDialogFragment = (LoadingDialog) fragment;
boolean isDialogFragmentReady = ActivityExtensionsKt.isDialogFragmentReady(this, loadingDialogFragment);
if (isDialogFragmentReady) {
loadingDialogFragment.dismiss();
fragmentManager.executePendingTransactions();
runOnUiThread(() -> {
FragmentManager fragmentManager = getSupportFragmentManager();
Fragment fragment = fragmentManager.findFragmentByTag(DIALOG_WAIT_TAG);
if (fragment != null) {
Log_OC.d(TAG, "dismiss loading dialog");
LoadingDialog loadingDialogFragment = (LoadingDialog) fragment;
boolean isDialogFragmentReady = ActivityExtensionsKt.isDialogFragmentReady(this, loadingDialogFragment);
if (isDialogFragmentReady) {
loadingDialogFragment.dismiss();
fragmentManager.executePendingTransactions();
}
}
}
});
}
private void doOnResumeAndBound() {

1
app/src/main/res/values-ar/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">بإنتظار مزامنة كاملة…</string>
<string name="file_name_validator_current_path_is_invalid">اسم المجلد الحالي غير صحيح. قُم رجاءً بتغيير اسم المجلد. إعادة التوجيه إلى المجلد الجذر</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">مسار المجلد يحتوي على أسماء محجوزة أو حروف غير صالحة</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s امتداد ملف غير مسموحٍ به</string>
<string name="file_name_validator_error_invalid_character">اسم يحتوي على حروف غير صالحة: %s</string>
<string name="file_name_validator_error_reserved_names">%s اسم ممنوع</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. قُم رجاءً بتغيير اسم الملف قبل نقله أو نسخه</string>

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

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Awaiting full sync…</string>
<string name="file_name_validator_current_path_is_invalid">Current folder name is invalid, please rename the folder. Redirecting to root</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Folder path contains reserved names or invalid character</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s is a forbidden file extension</string>
<string name="file_name_validator_error_invalid_character">Name contains an invalid character: %s</string>
<string name="file_name_validator_error_reserved_names">%s is a forbidden name</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Please rename the file before moving or copying</string>

1
app/src/main/res/values-de/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Warte auf die Fertigstellung aller Synchronisierungen …</string>
<string name="file_name_validator_current_path_is_invalid">Der aktuelle Ordnername ist unzulässig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Der Ordnerpfad enthält reservierte Namen oder ungültige Zeichen</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s ist eine unzulässige Dateierweiterung</string>
<string name="file_name_validator_error_invalid_character">Der Name enthält ein unzulässiges Zeichen: %s</string>
<string name="file_name_validator_error_reserved_names">%s ist ein unzulässiger Name</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Bitte Datei umbenennen, bevor diese verschoben oder kopiert wird</string>

1
app/src/main/res/values-eu/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Sinkronizazio osoaren zain...</string>
<string name="file_name_validator_current_path_is_invalid">Uneko karpetaren izena ez da baliozkoa, mesedez izena aldatu karpetari. Errora birbideratzen</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Karpetaren bideak izen erreserbatuak edo karaktere baliogabeak ditu</string>
<string name="file_name_validator_error_forbidden_file_extensions">%sdebekatutako fitxategi-luzapena da</string>
<string name="file_name_validator_error_invalid_character">Izenak karaktere baliogabe bat dauka: %s</string>
<string name="file_name_validator_error_reserved_names">%s debekatutako izen bat da</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Aldatu fitxategiaren izena mugitu edo kopiatu aurretik</string>

1
app/src/main/res/values-fr/strings.xml
View file

@ -410,7 +410,6 @@
<string name="file_migration_waiting_for_unfinished_sync">En attente de la synchronisation complète…</string>
<string name="file_name_validator_current_path_is_invalid">Le nom actuel du dossier est invalide, veuillez renommer le dossier. Redirection vers la racine</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Le chemin du dossier contient des noms réservés ou des caractères invalides</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s est une extension de fichier interdite</string>
<string name="file_name_validator_error_invalid_character">Le nom contient un caractère invalide : %s</string>
<string name="file_name_validator_error_reserved_names">%s est un nom interdit</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Veuillez renommer le fichier avant de le déplacer ou de le copier</string>

1
app/src/main/res/values-ga/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Ag feitheamh ar shioncronú iomlán…</string>
<string name="file_name_validator_current_path_is_invalid">Tá ainm an fhillteáin reatha neamhbhailí, le do thoil athainmnigh an fillteán. Atreorú chuig an fhréamh</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Tá ainmneacha forchoimeádta nó carachtar neamhbhailí i gcosán an fhillteáin</string>
<string name="file_name_validator_error_forbidden_file_extensions">Is iarmhír toirmiscthe comhaid é %s</string>
<string name="file_name_validator_error_invalid_character">Tá carachtar neamhbhailí san ainm: %s</string>
<string name="file_name_validator_error_reserved_names">Is ainm toirmiscthe é %s</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Athainmnigh an comhad le do thoil roimh é a bhogadh nó a chóipeáil</string>

1
app/src/main/res/values-gl/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Agardando que rematen as sincronizacións…</string>
<string name="file_name_validator_current_path_is_invalid">O nome actual do cartafol non é válido, cambie o nome do cartafol. Redireccionando á raíz</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">A ruta do cartafol contén nomes reservados ou caracteres non válidos</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s é unha extensión de ficheiro prohibida.</string>
<string name="file_name_validator_error_invalid_character">O nome contén un carácter non válido: %s</string>
<string name="file_name_validator_error_reserved_names">%s é un nome prohibido.</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Cambie o nome do ficheiro antes de mover ou copiar</string>

1
app/src/main/res/values-ko/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">모든 동기화가 완료되기를 기다리는 중…</string>
<string name="file_name_validator_current_path_is_invalid">현재 폴더 이름이 유효하지 않습니다. 폴더 이름을 변경해 주세요. 루트로 리디렉션됩니다.</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">폴더 경로에 예약된 이름 또는 잘못된 문자가 포함되어 있습니다</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s은(는) 금지된 파일 확장자입니다</string>
<string name="file_name_validator_error_invalid_character">이름에 잘못된 문자가 포함되어 있습니다: %s</string>
<string name="file_not_found">파일을 찾을 수 없음</string>
<string name="file_not_synced">파일을 동기화할 수 없습니다. 마지막으로 불러온 버전을 표시합니다.</string>

1
app/src/main/res/values-nb-rNO/strings.xml
View file

@ -411,7 +411,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Venter på full synkronisering…</string>
<string name="file_name_validator_current_path_is_invalid">Gjeldende mappenavn er ugyldig, vennligst gi nytt navn til mappen. Omdirigerer til rot</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Mappebanen inneholder reserverte navn eller ugyldige tegn</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s er en forbudt filtype</string>
<string name="file_name_validator_error_invalid_character">Navnet inneholder et ugyldig tegn: %s</string>
<string name="file_name_validator_error_reserved_names">%s er et forbudt navn</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Gi nytt navn til filen før du flytter eller kopierer</string>

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

@ -411,7 +411,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Aguardando sincronização completa…</string>
<string name="file_name_validator_current_path_is_invalid">O nome da pasta atual é inválido, renomeie a pasta. Redirecionando para a raiz</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">O caminho da pasta contém nomes reservados ou caracteres inválidos</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s é uma extensão de arquivo proibida</string>
<string name="file_name_validator_error_invalid_character">O nome contém um caractere inválido:%s</string>
<string name="file_name_validator_error_reserved_names">%s é um nome proibido</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Renomeie o arquivo antes de mover ou copiar</string>

1
app/src/main/res/values-ru/strings.xml
View file

@ -414,7 +414,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Ожидание завершения синхронизации…</string>
<string name="file_name_validator_current_path_is_invalid">Текущее имя папки неверное, пожалуйста, переименуйте папку. Перенаправление в корень</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Путь к папке содержит зарезервированные имена или недопустимый символ</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s является запрещенным расширением файла</string>
<string name="file_name_validator_error_invalid_character">Имя содержит недопустимый символ: %s</string>
<string name="file_name_validator_error_reserved_names">%s это запрещенное имя</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Пожалуйста, переименуйте файл перед перемещением или копированием</string>

1
app/src/main/res/values-sv/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Väntar på fullständig synkronisering…</string>
<string name="file_name_validator_current_path_is_invalid">Aktuellt mappnamn är ogiltigt. Byt namn på mappen. Omdirigerar till root</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Mappsökvägen innehåller reserverade namn eller ogiltiga tecken</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s är ett förbjudet filtillägg</string>
<string name="file_name_validator_error_invalid_character">Namnet innehåller ett ogiltigt tecken: %s</string>
<string name="file_name_validator_error_reserved_names">%s är ett förbjudet namn</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Byt namn på filen innan du flyttar eller kopierar</string>

1
app/src/main/res/values-tr/strings.xml
View file

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Eşitleme işleminin tamamlanması bekleniyor …</string>
<string name="file_name_validator_current_path_is_invalid">Geçerli klasör adı geçersiz. Lütfen klasörü yeniden adlandırın. Kök klasöre yönlendiriliyorsunuz.</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Klasör yolunda ayrılmış adlar veya geçersiz karakterler var</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s dosya uzantısına izin verilmiyor.</string>
<string name="file_name_validator_error_invalid_character">Ad içinde geçersiz bir karakter var: %s</string>
<string name="file_name_validator_error_reserved_names">%s adına izin verilmiyor</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Kopyalamadan ya da taşımadan önce lütfen dosyayı yeniden adlandırın</string>

9
app/src/main/res/values-uk/strings.xml
View file

@ -179,6 +179,7 @@
<string name="confirmation_remove_local">Лише на пристрої</string>
<string name="conflict_dialog_error">Неможливо ініціювати діалог розв\'язання конфлікту</string>
<string name="conflict_file_headline">Конфліктний файл %1$s</string>
<string name="conflict_folder_headline">Конфлікт з каталогом</string>
<string name="conflict_local_file">Файл на пристрої</string>
<string name="conflict_message_description">Якщо ви виберете обидві версії, то до назви локального файлу буде додано порядковий номер.</string>
<string name="conflict_server_file">Файл у хмарі</string>
@ -407,7 +408,6 @@
<string name="file_migration_waiting_for_unfinished_sync">Очікування повної синхронізації…</string>
<string name="file_name_validator_current_path_is_invalid">Перейменуйте назву поточого каталогу, оскільки його назва не є дійсною. Переспрямування до кореневого каталогу.</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Шлях до каталогу містить зарезервовані імена або недійсні символи</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s не є дозволеним розширенням файлу</string>
<string name="file_name_validator_error_invalid_character">Ім\'я містить недійсний символ: %s</string>
<string name="file_name_validator_error_reserved_names">%s не є дозволеним ім\'ям</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Перейменуйте файл перед переміщенням або копіюванням</string>
@ -564,6 +564,7 @@
<string name="note_could_not_sent">Неможливо надіслати нотатку</string>
<string name="note_icon_hint">Піктограма нотатки</string>
<string name="notification_action_failed">Не вдалося виконати дію.</string>
<string name="notification_channel_background_operations_name">Фонові операції</string>
<string name="notification_channel_download_description">Показує перебіг звантаження</string>
<string name="notification_channel_download_name_short">Звантаження</string>
<string name="notification_channel_file_sync_description">Показує перебіг синхронізації файлів та результати</string>
@ -579,7 +580,13 @@
<string name="notification_icon">Значок сповіщень</string>
<string name="notifications_no_results_headline">Немає сповіщень</string>
<string name="notifications_no_results_message">Будь ласка, перейдіть сюди пізніше.</string>
<string name="oc_file_list_adapter_offline_operation_description_text">Операції, що тривають</string>
<string name="offline_mode">Відсутнє з\'єднання з мережею</string>
<string name="offline_operations_worker_notification_conflict_text">Конфлікт з каталогом %s</string>
<string name="offline_operations_worker_notification_delete_offline_folder">Вилучити каталог на пристрої</string>
<string name="offline_operations_worker_notification_error_text">Неможливо виконати офлайнову операцію. %s</string>
<string name="offline_operations_worker_notification_manager_ticker">Офлайнові операції</string>
<string name="offline_operations_worker_notification_start_text">Початок офлайнових операцій</string>
<string name="oneHour">1 година</string>
<string name="online">Онлайн</string>
<string name="online_status">Статус онлайну</string>

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

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">等待完整同步…</string>
<string name="file_name_validator_current_path_is_invalid">目前資料夾名稱無效，請重新命名該資料夾。重定向到根目錄</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">資料夾途徑包含保留名稱或無效字符</string>
<string name="file_name_validator_error_forbidden_file_extensions">「%s」是禁止使用的副檔名。</string>
<string name="file_name_validator_error_invalid_character">名字含有無效的字元：「%s」。</string>
<string name="file_name_validator_error_reserved_names">「%s」是禁止使用的名字。</string>
<string name="file_name_validator_rename_before_move_or_copy">%s。請在移動或複製之前重新命名檔案</string>

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

@ -413,7 +413,6 @@
<string name="file_migration_waiting_for_unfinished_sync">正在等待完全同步……</string>
<string name="file_name_validator_current_path_is_invalid">目前資料夾名稱無效，請重新命名資料夾。重新導向至根目錄</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">資料夾路徑包含保留名稱或無效字元</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s 是禁止使用的副檔名</string>
<string name="file_name_validator_error_invalid_character">名稱包含無效的字元：%s</string>
<string name="file_name_validator_error_reserved_names">%s 是禁止的名稱</string>
<string name="file_name_validator_rename_before_move_or_copy">%s。請在移動或複製前重新命名檔案</string>