mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +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 2023-07-24 02:31:21 +02:00
commit 4924834518
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/unit-tests.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
if: ${{ always() }} if: ${{ always() }}
run: scripts/deleteOldComments.sh "test" "Unit" ${{github.event.number}} run: scripts/deleteOldComments.sh "test" "Unit" ${{github.event.number}}
- name: Run unit tests with coverage - name: Run unit tests with coverage
uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1 uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
with: with:
arguments: jacocoTestGplayDebugUnitTest arguments: jacocoTestGplayDebugUnitTest
- name: Upload failing results - name: Upload failing results

5
app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
View file

@ -1,7 +1,8 @@
/* /*
* ownCloud Android client application * ownCloud Android client application
* * @author TSI-mc
* Copyright (C) 2016 ownCloud Inc. * Copyright (C) 2016 ownCloud Inc.
* Copyright (C) 2023 TSI-mc
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2, * it under the terms of the GNU General Public License version 2,
@ -178,7 +179,7 @@ open class FolderPickerActivity :
if (listFragment != null) { if (listFragment != null) {
if (!mSyncInProgress) { if (!mSyncInProgress) {
listFragment.setMessageForEmptyList( listFragment.setMessageForEmptyList(
R.string.file_list_empty_headline, R.string.folder_list_empty_headline,
R.string.file_list_empty_moving, R.string.file_list_empty_moving,
R.drawable.ic_list_empty_create_folder, R.drawable.ic_list_empty_create_folder,
true true

4
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
jacoco_version = '0.8.10' jacoco_version = '0.8.10'
kotlin_version = '1.8.22' kotlin_version = '1.8.22'
androidxTestVersion = "1.4.0" androidxTestVersion = "1.4.0"
daggerVersion = "2.46.1" daggerVersion = "2.47"
markwonVersion = "4.6.2" markwonVersion = "4.6.2"
prismVersion = "2.0.0" prismVersion = "2.0.0"
androidLibraryVersion ="1d4650805b81bb7dc057f40a4f82e02ca9121d59" androidLibraryVersion ="1d4650805b81bb7dc057f40a4f82e02ca9121d59"
@ -16,7 +16,7 @@ buildscript {
workRuntime = "2.8.1" workRuntime = "2.8.1"
fidoVersion = "4.1.0-patch1" fidoVersion = "4.1.0-patch1"
checkerVersion = "3.21.2" checkerVersion = "3.21.2"
exoplayerVersion = "2.18.7" exoplayerVersion = "2.19.0"
documentScannerVersion = "1.0.1" documentScannerVersion = "1.0.1"
roomVersion = "2.5.2" roomVersion = "2.5.2"