From 3cf66f1c949074402a63faca01b748d1a368972c Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 25 Sep 2024 11:50:48 +0200 Subject: [PATCH 01/10] Simplify onBackPressed Signed-off-by: alperozturk --- .../ui/activity/FileDisplayActivity.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index a2bc0ab7a7..b7ddb9b5f4 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1020,22 +1020,25 @@ public class FileDisplayActivity extends FileActivity @Override public void onBackPressed() { final boolean isDrawerOpen = isDrawerOpen(); + if (isDrawerOpen) { + super.onBackPressed(); + return; + } + final boolean isSearchOpen = isSearchOpen(); - - final Fragment leftFragment = getLeftFragment(); - if (isSearchOpen) { resetSearchAction(); - } else if (isDrawerOpen) { - super.onBackPressed(); - } else if (leftFragment instanceof OCFileListFragment listOfFiles) { + return; + } - // all closed + final Fragment leftFragment = getLeftFragment(); + if (leftFragment instanceof OCFileListFragment listOfFiles) { OCFile currentDir = getCurrentDir(); if (isRoot(currentDir)) { finish(); return; } + browseUp(listOfFiles); } else { popBack(); From 8434a4887cf7df786c2d594c59c889a7a9ed2cc5 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 25 Sep 2024 11:55:21 +0200 Subject: [PATCH 02/10] remove variable assignments Signed-off-by: alperozturk --- .../ui/activity/FileDisplayActivity.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index b7ddb9b5f4..15529897b6 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1019,27 +1019,22 @@ public class FileDisplayActivity extends FileActivity @SuppressFBWarnings("ITC_INHERITANCE_TYPE_CHECKING") @Override public void onBackPressed() { - final boolean isDrawerOpen = isDrawerOpen(); - if (isDrawerOpen) { + if (isDrawerOpen()) { super.onBackPressed(); return; } - final boolean isSearchOpen = isSearchOpen(); - if (isSearchOpen) { + if (isSearchOpen()) { resetSearchAction(); return; } - final Fragment leftFragment = getLeftFragment(); - if (leftFragment instanceof OCFileListFragment listOfFiles) { - OCFile currentDir = getCurrentDir(); - if (isRoot(currentDir)) { + if (getLeftFragment() instanceof OCFileListFragment listOfFiles) { + if (isRoot(getCurrentDir())) { finish(); - return; + } else { + browseUp(listOfFiles); } - - browseUp(listOfFiles); } else { popBack(); } From b057344e46d2254392553a96156e1d60c02371e8 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 1 Oct 2024 16:51:19 +0200 Subject: [PATCH 03/10] change check order Signed-off-by: alperozturk --- .../owncloud/android/ui/activity/FileDisplayActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 15529897b6..67a00a3709 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1019,13 +1019,13 @@ public class FileDisplayActivity extends FileActivity @SuppressFBWarnings("ITC_INHERITANCE_TYPE_CHECKING") @Override public void onBackPressed() { - if (isDrawerOpen()) { - super.onBackPressed(); + if (isSearchOpen()) { + resetSearchAction(); return; } - if (isSearchOpen()) { - resetSearchAction(); + if (isDrawerOpen()) { + super.onBackPressed(); return; } From 7391fe60c09d3d608cf10758e174650157bdaa23 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 6 Oct 2024 02:53:18 +0000 Subject: [PATCH 04/10] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 2 ++ 4 files changed, 5 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3006b41d33..d6f06d2190 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -56,6 +56,7 @@ تمّ حذف المهمة بنجاح تعذّر جلب قائمة المهام. قم رجاءً بالتحقُّق من اتصالك بالإنترنت. حذف مهمة + مخرجات المهمة لم تجهز بعدُ. تعذّر جلب أنواع المهام. قم رجاءً بالتحقُّق من اتصالك بالإنترنت. المُساعِد غير معروف diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7b9af07af5..7e44b52428 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -56,6 +56,7 @@ Aufgabe gelöscht Die Aufgabenliste kann nicht abgerufen werden. Bitte überprüfen Sie Ihre Internetverbindung. Aufgabe löschen + Die Aufgabenausgabe ist noch nicht fertig. Die Aufgabentypen können nicht abgerufen werden. Bitte überprüfen Sie Ihre Internetverbindung. Assistent Unbekannt diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 4d065e2c96..30171e1008 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -56,6 +56,7 @@ A tarefa foi eliminada satisfactoriamente Non é posíbel recuperar a lista de tarefas. Comprobe a conexión a Internet. Eliminar tarefa + A saída da tarefa aínda non está preparada. Non é posíbel recuperar os tipos de tarefas. Comprobe a conexión a Internet. Asistente Descoñecido diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3b56361030..6dc57b4282 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -56,6 +56,7 @@ Tarefa excluída com sucesso Não foi possível buscar a lista de tarefas. Verifique sua conexão com a Internet. Excluir tarefa + A saída da tarefa ainda não está pronta. Não foi possível buscar os tipos de tarefas. Verifique sua conexão com a Internet. Assistente Desconhecido @@ -590,6 +591,7 @@ Mostra o progresso de envio Enviados Ícone de notificação + Existem notificações não lidas Não há notificações Por favor, verifique mais tarde. Operação Pendente From 05ed5fe71eea5153c2a019a9f75c59ea1e66cd00 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 7 Oct 2024 02:45:49 +0000 Subject: [PATCH 05/10] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- app/src/main/res/values-b+en+001/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml index 8fd010e306..549e339769 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -56,6 +56,7 @@ Task successfully deleted Unable to fetch task list, please check your internet connection. Delete Task + The task output isn’t ready yet. Unable to fetch task types, please check your internet connection. Assistant Unknown diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index fbe39e3e16..b1aa5fa8d5 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -56,6 +56,7 @@ Görev silindi Görev listesi alınamadı. Lütfen İnternet bağlantınızı denetleyin. Görevi sil + Görev dosyası henüz hazır değil. Görev türleri alınamadı. Lütfen İnternet bağlantınızı denetleyin. Yardımcı Bilinmiyor diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 52e0d700fd..b6eb7a8892 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -56,6 +56,7 @@ 已成功刪除工作項目 無法擷取工作項目清單，請檢查您的網際網路連線。 刪除工作項目 + 任務輸出尚未就緒。 無法擷取工作項目類型，請檢查您的網際網路連線。 助理 未知 From 801210813aacba91903180de92dd33a19757ce51 Mon Sep 17 00:00:00 2001 From: Tobias Kaminsky Date: Sun, 6 Oct 2024 00:09:31 +0200 Subject: [PATCH 06/10] Update library to 2024-10-06 Signed-off-by: Tobias Kaminsky Signed-off-by: tobiasKaminsky --- build.gradle | 2 +- gradle/verification-metadata.xml | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 305271186f..e4574829e8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ */ buildscript { ext { - androidLibraryVersion ="39b8616c2899ad23e7d1d43890cfb25a4b191b6d" + androidLibraryVersion ="ceb3812b688f2288911acf4d917596283fab0ea5" androidPluginVersion = '8.6.1' androidxMediaVersion = '1.4.1' androidxTestVersion = "1.6.1" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5d39e3b8bb..ad08aee4f6 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -6281,6 +6281,14 @@ + + + + + + + + @@ -7119,6 +7127,11 @@ + + + + + @@ -7938,6 +7951,11 @@ + + + + + @@ -7964,6 +7982,11 @@ + + + + + From 2113f81354d1007d15a394d1d25a7a192e1bae07 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Mon, 7 Oct 2024 07:42:01 +0000 Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/?= =?UTF-8?q?workflows/'=20with=20remote=20'config/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- .github/workflows/analysis.yml | 8 ++++---- .github/workflows/codeql.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index df08967031..0da370e62f 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -24,7 +24,7 @@ concurrency: jobs: analysis: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Setup variables id: get-vars @@ -48,14 +48,14 @@ jobs: with: repository: ${{ steps.get-vars.outputs.repo }} ref: ${{ steps.get-vars.outputs.branch }} - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: "temurin" - java-version: 17 + java-version: 21 - name: Install dependencies run: | - python3 -m pip install defusedxml + sudo apt install python3-defusedxml - name: Run analysis wrapper env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index cfa282cea8..c645fc3e88 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -22,7 +22,7 @@ permissions: jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read @@ -42,11 +42,11 @@ jobs: uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 with: languages: ${{ matrix.language }} - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: "temurin" - java-version: 17 + java-version: 21 - name: Assemble run: | mkdir -p "$HOME/.gradle" From eff12795fbf27fb085fb08cdc826dc469901de39 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 07:25:17 +0000 Subject: [PATCH 08/10] Update dependency com.android.tools.build:gradle to v8.7.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle | 2 +- gradle/verification-metadata.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4574829e8..166786b134 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { ext { androidLibraryVersion ="ceb3812b688f2288911acf4d917596283fab0ea5" - androidPluginVersion = '8.6.1' + androidPluginVersion = '8.7.0' androidxMediaVersion = '1.4.1' androidxTestVersion = "1.6.1" appCompatVersion = '1.7.0' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index ad08aee4f6..e5eef1a463 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4254,6 +4254,14 @@ + + + + + + + + From d4e4c5120bcc67028ee756d04948602b82367632 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Mon, 7 Oct 2024 16:31:07 +0000 Subject: [PATCH 09/10] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/?= =?UTF-8?q?workflows/'=20with=20remote=20'config/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- .github/workflows/analysis.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 0da370e62f..22bad3af61 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -48,11 +48,11 @@ jobs: with: repository: ${{ steps.get-vars.outputs.repo }} ref: ${{ steps.get-vars.outputs.branch }} - - name: Set up JDK 21 + - name: Set up JDK 17 uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: "temurin" - java-version: 21 + java-version: 17 - name: Install dependencies run: | sudo apt install python3-defusedxml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c645fc3e88..2b65890051 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -42,11 +42,11 @@ jobs: uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 with: languages: ${{ matrix.language }} - - name: Set up JDK 21 + - name: Set up JDK 17 uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: "temurin" - java-version: 21 + java-version: 17 - name: Assemble run: | mkdir -p "$HOME/.gradle" From 09476cfc23352586aa10c1537c96583baebe83b7 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Mon, 7 Oct 2024 22:18:07 +0000 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/?= =?UTF-8?q?workflows/'=20with=20remote=20'config/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- .github/workflows/analysis.yml | 2 +- .github/workflows/codeql.yml | 6 +++--- .github/workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/scorecard.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 22bad3af61..76212b9665 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -44,7 +44,7 @@ jobs: echo "repo=${{ github.event.pull_request.head.repo.full_name }}" } >> "$GITHUB_OUTPUT" fi - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: repository: ${{ steps.get-vars.outputs.repo }} ref: ${{ steps.get-vars.outputs.branch }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2b65890051..efa349f682 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -33,13 +33,13 @@ jobs: language: [ 'java' ] steps: - name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - name: Set Swap Space uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0 with: swap-size-gb: 10 - name: Initialize CodeQL - uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 + uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 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@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 + uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 76520536d2..bc8eb8d180 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -25,5 +25,5 @@ jobs: name: "Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 74ca98d585..fc32557b88 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -29,7 +29,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false @@ -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@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 + uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 with: sarif_file: results.sarif