diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index df08967031..76212b9665 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
@@ -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 }}
@@ -55,7 +55,7 @@ jobs:
java-version: 17
- 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..efa349f682 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
@@ -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
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..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,24 +1019,22 @@ public class FileDisplayActivity extends FileActivity
@SuppressFBWarnings("ITC_INHERITANCE_TYPE_CHECKING")
@Override
public void onBackPressed() {
- final boolean isDrawerOpen = isDrawerOpen();
- final boolean isSearchOpen = isSearchOpen();
-
- final Fragment leftFragment = getLeftFragment();
-
- if (isSearchOpen) {
+ if (isSearchOpen()) {
resetSearchAction();
- } else if (isDrawerOpen) {
- super.onBackPressed();
- } else if (leftFragment instanceof OCFileListFragment listOfFiles) {
+ return;
+ }
- // all closed
- OCFile currentDir = getCurrentDir();
- if (isRoot(currentDir)) {
+ if (isDrawerOpen()) {
+ super.onBackPressed();
+ return;
+ }
+
+ if (getLeftFragment() instanceof OCFileListFragment listOfFiles) {
+ if (isRoot(getCurrentDir())) {
finish();
- return;
+ } else {
+ browseUp(listOfFiles);
}
- browseUp(listOfFiles);
} else {
popBack();
}
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-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-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
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 @@
已成功刪除工作項目
無法擷取工作項目清單，請檢查您的網際網路連線。
刪除工作項目
+ 任務輸出尚未就緒。
無法擷取工作項目類型，請檢查您的網際網路連線。
助理
未知
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 a7f1dd2247..3d636b6d33 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4254,6 +4254,14 @@
+
+
+
+
+
+
+
+
@@ -6417,22 +6425,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -7276,14 +7268,9 @@
-
-
-
-
-
-
-
-
+
+
+
@@ -8140,6 +8127,11 @@
+
+
+
+
+
@@ -8166,6 +8158,11 @@
+
+
+
+
+