mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 07:22:06 +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-10-08 03:37:45 +02:00
commit cb721cf890
14 changed files with 52 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/analysis.yml vendored
View file

@ -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 }}

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

@ -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

2
.github/workflows/gradle-wrapper-validation.yml vendored
View file

@ -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

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

@ -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

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

@ -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();
}

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

@ -56,6 +56,7 @@
<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>

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

@ -56,6 +56,7 @@
<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>

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

@ -56,6 +56,7 @@
<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>

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

@ -56,6 +56,7 @@
<string name="assistant_screen_task_delete_success_message">A tarefa foi eliminada satisfactoriamente</string>
<string name="assistant_screen_task_list_error_state_message">Non é posíbel recuperar a lista de tarefas. Comprobe a conexión a Internet.</string>
<string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Eliminar tarefa</string>
<string name="assistant_screen_task_output_empty_text">A saída da tarefa aínda non está preparada.</string>
<string name="assistant_screen_task_types_error_state_message">Non é posíbel recuperar os tipos de tarefas. Comprobe a conexión a Internet.</string>
<string name="assistant_screen_top_bar_title">Asistente</string>
<string name="assistant_screen_unknown_task_status_text">Descoñecido</string>

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

@ -56,6 +56,7 @@
<string name="assistant_screen_task_delete_success_message">Tarefa excluída com sucesso</string>
<string name="assistant_screen_task_list_error_state_message">Não foi possível buscar a lista de tarefas. Verifique sua conexão com a Internet.</string>
<string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Excluir tarefa</string>
<string name="assistant_screen_task_output_empty_text">A saída da tarefa ainda não está pronta.</string>
<string name="assistant_screen_task_types_error_state_message">Não foi possível buscar os tipos de tarefas. Verifique sua conexão com a Internet.</string>
<string name="assistant_screen_top_bar_title">Assistente</string>
<string name="assistant_screen_unknown_task_status_text">Desconhecido</string>
@ -590,6 +591,7 @@
<string name="notification_channel_upload_description">Mostra o progresso de envio</string>
<string name="notification_channel_upload_name_short">Enviados</string>
<string name="notification_icon">Ícone de notificação</string>
<string name="notification_icon_description">Existem notificações não lidas</string>
<string name="notifications_no_results_headline">Não há notificações</string>
<string name="notifications_no_results_message">Por favor, verifique mais tarde.</string>
<string name="oc_file_list_adapter_offline_operation_description_text">Operação Pendente</string>

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

@ -56,6 +56,7 @@
<string name="assistant_screen_task_delete_success_message">Görev silindi</string>
<string name="assistant_screen_task_list_error_state_message">Görev listesi alınamadı. Lütfen İnternet bağlantınızı denetleyin.</string>
<string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Görevi sil</string>
<string name="assistant_screen_task_output_empty_text">Görev dosyası henüz hazır değil.</string>
<string name="assistant_screen_task_types_error_state_message">Görev türleri alınamadı. Lütfen İnternet bağlantınızı denetleyin.</string>
<string name="assistant_screen_top_bar_title">Yardımcı</string>
<string name="assistant_screen_unknown_task_status_text">Bilinmiyor</string>

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

@ -56,6 +56,7 @@
<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>

2
build.gradle
View file

@ -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'

45
gradle/verification-metadata.xml
View file

@ -4254,6 +4254,14 @@
<sha256 value="f2e8aad4455a42372462d5e18a26973d67571179a6757f3825f227e91af2f2db" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.android.tools.build" name="bundletool" version="1.17.1">
<artifact name="bundletool-1.17.1.jar">
<sha256 value="392fd3b099bd82b116c8772ab8fc4139984a91108a643f8dfc9ee29648818ad8" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="bundletool-1.17.1.pom">
<sha256 value="7cdd337644d523fe60cfb632410c6b7fb7d982eec53270ddbedff1c26333545d" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle" version="8.2.2">
<artifact name="gradle-8.2.2.jar">
<sha256 value="ca50f47cd13d347de7c89ecb2bd06487b03a88687c46c2b776bc0a9323958955" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -6417,22 +6425,6 @@
<sha256 value="23be4020754cbb39a6d197281a0d55f84e8851b13afa204081e29132d785a340" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="d1d31645733eddf6c1dd8e47712ea7daa11709d3">
<artifact name="android-library-d1d31645733eddf6c1dd8e47712ea7daa11709d3.aar">
<sha256 value="c6c70775d49d935e7691f43fee0ff51c2c0df03c041fd75da92cf1f0df1385a7" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-d1d31645733eddf6c1dd8e47712ea7daa11709d3.module">
<sha256 value="22d506bcb156af48454dc94bac759a1b0f893af9f3ad723386ed452bb43f22ef" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="d280f2b11e5b00048677c85a795d262c1bfe5dda">
<artifact name="android-library-d280f2b11e5b00048677c85a795d262c1bfe5dda.aar">
<sha256 value="c6c70775d49d935e7691f43fee0ff51c2c0df03c041fd75da92cf1f0df1385a7" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-d280f2b11e5b00048677c85a795d262c1bfe5dda.module">
<sha256 value="a4fdea06148d070d9f055b0eaaa37ecc985a9642123fbc9d35c0359af8381681" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="d8c46b28ff7f268af5dfad7075f390d8eac434cd">
<artifact name="android-library-d8c46b28ff7f268af5dfad7075f390d8eac434cd.aar">
<sha256 value="c253a126ca3c32dd5b373ab1c64668e4603305b3113b052fc0fc5e3c833a913c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -7276,14 +7268,9 @@
<sha256 value="e7a42ea78dbd6f67062a0a0d75dae491b59fe861fa2c48b3c07a7eb6b6c2def2" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.0.0-1.0.23">
<artifact name="symbol-processing-api-2.0.0-1.0.23.module">
<sha256 value="46829645cee8c87e89b26a447770bb46303ceccef9c3bd4fb4e969512936b651" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.0.20-1.0.24">
<artifact name="symbol-processing-api-2.0.20-1.0.24.module">
<sha256 value="65fe1c2eb26899390b1018808dda05e9d88aec4bed37f715b1f5b4677d16f2e9" origin="Generated by Gradle"/>
<component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.0.20-1.0.25">
<artifact name="symbol-processing-api-2.0.20-1.0.25.module">
<sha256 value="5d7043218cdf26359bdfec4ba678aed794baaad4a7e040344d33a2ed928847ee" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="1.8.22-1.0.11">
@ -8140,6 +8127,11 @@
<sha256 value="6c3070820b591f5ec8c2948497b5a6b742f492b715bcacf4b75115b3a8ffab15" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.squareup.okhttp3" name="okhttp" version="4.12.0">
<artifact name="okhttp-4.12.0.module">
<sha256 value="607e220ff8215b929d829bbf54f332894f1459b4d795979aeafcbcc1cea54cf3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.squareup.okhttp3" name="okhttp" version="5.0.0-alpha.12">
<artifact name="okhttp-5.0.0-alpha.12.module">
<sha256 value="caf029b7f801e5efcbe42a070edc897796fa4ef6ce4a9b6aa3357f4fd3bb33c8" origin="Generated by Gradle"/>
@ -8166,6 +8158,11 @@
<sha256 value="661d3b3c33a764014c738021c9225c2cf09598970918313fed64dcb04022f54b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.squareup.okio" name="okio" version="3.6.0">
<artifact name="okio-3.6.0.module">
<sha256 value="6a47ac50364e6598459401fb86f9b6cfcdf637b9b3a3045b1cc33cbf4c408218" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.squareup.okio" name="okio" version="3.7.0">
<artifact name="okio-3.7.0.module">
<sha256 value="f3cae009f0b6c842fbbc52ce77542c19d19d56ee99a5e555647f0bafc9d50cfa" origin="Generated by Gradle"/>