mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 00:12:05 +03:00
Code Issues Projects Releases Packages Wiki Activity
19011 commits 220 branches 1587 tags 639 MiB
Commit graph

19011 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Kaminsky
427b503b8a
Merge pull request #10443 from nextcloud/export 
File export / download
 2022-07-07 10:02:40 +02:00
tobiasKaminsky
61b85ed52f
fix lint warnings 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-07 09:57:36 +02:00
Álvaro Brey
ffd49266ec
FolderPickerActivity: call super.onCreateOptionsMenu inside overriding method 
Fixes a bug where ExtendedListFragment.onCreateOptionsMenu is not called for the child fragment

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-07 09:15:53 +02:00
Nextcloud bot
0e0bfbbd12
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-07 04:09:05 +00:00
A117870935
a72932731f
Media view filter options 
Squashed commit of the following:

commit ddb107778d
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Tue Jul 5 18:15:38 2022 +0530

    Delete FolderPickerActivity.java

commit f471cc2810
Merge: 0c5b2309bc 1341f1fbe6
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Tue Jul 5 18:13:43 2022 +0530

    Merge branch 'media-view-options' of https://github.com/nextmcloud/android into media-view-options

commit 0c5b2309bc
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Tue Jul 5 18:12:44 2022 +0530

    Rebasing with master

commit de4eeb5004
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Fri Jun 24 10:45:22 2022 +0530

    Code optimisation.

commit eb8128df34
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Mon May 9 16:57:14 2022 +0530

    Removed unused code and code optimisation

commit ed00306ee7
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Fri May 6 12:23:47 2022 +0530

    Code formatting via KtLint

commit a7e925d692
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Thu May 5 17:28:51 2022 +0530

    Code optimisation, copyrights added and bug fixing.

commit ccb07fc73b
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit 60e27ce765
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit e4e29d8cdc
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit 3cd34b4bfb
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit 391ef3a21e
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit b614cfa213
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit eb864fb22b
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

commit fc4788e796
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 16:02:19 2022 +0530

    Rebased with master and conflicts resolved

commit ee0d13a438
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit 6bf6fb210d
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit 0964f77cdb
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit 7eeea6219a
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit 078a462149
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit 579e42f64a
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit 093dfea09b
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

commit 0ddbf0475b
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Fri Jun 24 10:45:22 2022 +0530

    Code optimisation.

commit 19a0b04663
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Mon May 9 16:57:14 2022 +0530

    Removed unused code and code optimisation

commit ab9e31e938
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Fri May 6 12:23:47 2022 +0530

    Code formatting via KtLint

commit 0a6504010a
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Thu May 5 17:28:51 2022 +0530

    Code optimisation, copyrights added and bug fixing.

commit c74d64685b
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit 5b091f2307
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit 1c13b07673
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit 5f42a5b498
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit ac8a715992
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit 4b8b1817a7
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit 74f8b2b36f
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

commit eb442ac4a6
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 16:02:19 2022 +0530

    Rebased with master and conflicts resolved

commit 54694d452c
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit 867ba2fb22
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit 508f3a3c8a
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit 0d6db1e230
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit 6c3de6eecf
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit 4bb9f91e8a
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit 999b8dfa6a
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

commit 1341f1fbe6
Merge: 414e0754bf 57b414e4c1
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Fri Jun 24 11:49:40 2022 +0530

    Code optimisation.

commit 414e0754bf
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Fri Jun 24 10:45:22 2022 +0530

    Code optimisation.

commit 757102a5f1
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Mon May 9 16:57:14 2022 +0530

    Removed unused code and code optimisation

commit 4512af4327
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Fri May 6 12:23:47 2022 +0530

    Code formatting via KtLint

commit 4d3d9297e9
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Thu May 5 17:28:51 2022 +0530

    Code optimisation, copyrights added and bug fixing.

commit fd7c0a95f1
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit f6dec19fd9
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit 38ce2e55e0
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit 5745cc9e67
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit 42217c395f
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit c30388b4b6
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit d7fd0707e4
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

commit 33294957fb
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 16:02:19 2022 +0530

    Rebased with master and conflicts resolved

commit e50cca657a
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit d11c0478cc
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit 2f258a0a25
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit dee21a4b45
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit d27f91ea3a
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit 56f2e70f67
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit edccc6a78f
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

commit 57b414e4c1
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Fri Jun 24 10:45:22 2022 +0530

    Code optimisation.

commit 9bde395980
Merge: 038663cdc9 03453c787a
Author: surinder-tsys <89455194+surinder-tsys@users.noreply.github.com>
Date:   Mon May 9 17:10:13 2022 +0530

    Merge branch 'master' into media-view-options

commit 038663cdc9
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Mon May 9 16:57:14 2022 +0530

    Removed unused code and code optimisation

commit 8f999f2eb0
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Fri May 6 12:23:47 2022 +0530

    Code formatting via KtLint

commit e842fa134a
Merge: 67763af48e 2d6b504284
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Thu May 5 17:29:23 2022 +0530

    Merge branch 'media-view-options' of https://github.com/nextmcloud/android into media-view-options

commit 67763af48e
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Thu May 5 17:28:51 2022 +0530

    Code optimisation, copyrights added and bug fixing.

commit 2d6b504284
Merge: 47b44babf9 1924041e4b
Author: surinder-tsys <89455194+surinder-tsys@users.noreply.github.com>
Date:   Wed May 4 10:16:30 2022 +0530

    Merge branch 'master' into media-view-options

commit 47b44babf9
Merge: f82b32fc74 184d13e8f2
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 16:13:03 2022 +0530

    Conflicts resolved

commit f82b32fc74
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 16:02:19 2022 +0530

    Rebased with master and conflicts resolved

commit 9c6080fcdd
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit 60a29a7eec
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit 903bdfbce6
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit 0cd9354dc8
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit 474341be78
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit 8600486da7
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit d04b668764
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

commit 184d13e8f2
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:25:50 2022 +0530

    Removed copyrights

commit 8d1018ba8f
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:22:15 2022 +0530

    Removed unused drawables

commit b44e3dbb8f
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Tue May 3 15:19:29 2022 +0530

    Updated design changes

commit e559d94cfa
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:07:46 2022 +0530

    Update gradle.properties

    Reverted gradle.properies.

commit 484a6b8f69
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 21:02:33 2022 +0530

    Copyrights added.

commit 4d607b6ae4
Author: Kumar <Surinder.Kumar@t-systems.com>
Date:   Wed Apr 27 20:42:39 2022 +0530

    Update build.gradle

    Reverted gradle version.

commit 95fafabe8a
Author: A117870935 <surinder.kumar@t-systems.com>
Date:   Wed Apr 27 19:02:17 2022 +0530

    Added 3 dot menu to filter Media data.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-06 14:50:37 +02:00
Álvaro Brey
3c7e429465
FilesExport*: fix detekt issues 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-06 14:42:23 +02:00
Álvaro Brey
e400d3c0b8
FilesExportWork: extract method to reduce complexity of doWork 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-06 14:41:53 +02:00
Tobias Kaminsky
c4540e7310
Merge pull request #10478 from nextcloud/permissionDialog 
recreate StoragePermissionDialogFragment when rotating
 2022-07-06 14:06:55 +02:00
tobiasKaminsky
85a645d3a4
better i18n handling 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 14:06:20 +02:00
tobiasKaminsky
c5302e943d
Remove unused resource 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 14:06:20 +02:00
tobiasKaminsky
9fb607cc9a
also allow export in FileDetailFragment 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 14:06:20 +02:00
tobiasKaminsky
72044454c1
rename last remaining FileDownload occurrences 
early exit in FilesExportWork.kt

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 14:06:20 +02:00
Álvaro Brey
db4e9887b1
FilesExportWork: use getActivity for PendingIntent 
With the broadcast, the notification drawer will not autoclose to show the file browser, which is not good UX.

With this approach the notification will not be autodismissed, but that's the lesser of two evils.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-06 14:06:20 +02:00
tobiasKaminsky
1d69dcfcaa
File export aka "download" 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 14:06:18 +02:00
tobiasKaminsky
3ec348d5f6
recreate StoragePermissionDialogFragment when rotating 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 12:18:52 +02:00
Tobias Kaminsky
6441e5d189
Merge pull request #10392 from nextcloud/encryptedFavorites 
on favorite/recent search: update encrypted files
 2022-07-06 12:13:17 +02:00
Tobias Kaminsky
fa21cef158
Merge pull request #10322 from nextcloud/e2ePass 
only encrypt folder if key is setup
 2022-07-06 12:12:44 +02:00
tobiasKaminsky
9d80622d23
only encrypt folder if key is setup 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 10:59:08 +02:00
Álvaro Brey
b8800a9906
FileDetailsSharingProcessFragment: avoid crashing when modifying existing shares 
This can only happen on certain codepaths but should be avoided anyway.

Fixes #10480

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-06 09:56:14 +02:00
tobiasKaminsky
5e58fdae4c
fix potential NPE 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-06 09:41:19 +02:00
Álvaro Brey
2e3ac1850b
FileActivity: fix crash when creating share link from FileDetailsFragment 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-06 09:41:14 +02:00
Tobias Kaminsky
d14ba71b10
Merge pull request #10388 from nextcloud/unsetEncryptedFolder 
Only allow folder to unset if not in e2e subtree
 2022-07-06 09:02:32 +02:00
Álvaro Brey
8cc3bd1d41
Merge pull request #10448 from nextcloud/fix/offline-sync-server-ping 
Avoid checking for walled connection until necessary
 2022-07-05 16:44:02 +02:00
Álvaro Brey
f19e3b7f33
Merge pull request #10323 from nextcloud/disableSharingOnE2E 
Disable sharing on e2e
 2022-07-05 16:41:09 +02:00
Álvaro Brey
c8aa577589
When retrying failing uploads, delay connectivity check until last possible moment 
This avoids network calls if the uploads can't be done for other reason (such as missing files)

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-05 14:52:23 +02:00
Álvaro Brey
a62373efb4
OfflineSyncWork: minor refactor to make more readable 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-05 14:52:23 +02:00
Álvaro Brey
8a0609044f
OfflineSyncWork: remove unused wakelock 
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-05 14:52:23 +02:00
Álvaro Brey
b7cf2a5d67
OfflineSyncWork: do not proactively ping server for connectivity unless sync fails 
Co-authored-by: obel1x <obel1x@web.de>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-05 14:52:23 +02:00
tobiasKaminsky
935b71ed86 rebase 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 12:25:23 +00:00
tobiasKaminsky
efa7875dcd explanation of tab count 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 12:25:23 +00:00
tobiasKaminsky
2c69d94162 fix uploadReport.sh 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 12:25:23 +00:00
tobiasKaminsky
c6681407bf Do not show sharing option at all 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 12:25:23 +00:00
tobiasKaminsky
c8e523b2c1 Do not show sharing tab when folder is encrypted 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 12:25:23 +00:00
Tobias Kaminsky
074b914b5f
Merge pull request #10232 from nextcloud/offlineNavigation 
Fix Notification -> on device navigation path
 2022-07-05 14:21:29 +02:00
Tobias Kaminsky
00bf0f28fb
Merge pull request #10473 from nextcloud/onDeviceWrongMessage 
Shared -> OnDevice -> now correct message
 2022-07-05 10:59:02 +02:00
tobiasKaminsky
a4829d4567
on favorite/recent search: update encrypted files 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 10:57:12 +02:00
tobiasKaminsky
d31ba4b3e6
Only allow folder to unset if not in e2e subtree 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 10:44:26 +02:00
Álvaro Brey
e8d2989295
Prevent crash when selecting too many files to copy or move (#10476) 
* Prevent crash when selecting too many files to copy or move

This is caused by too much data in intent extras as we're passing a fat arraylist of objects.
As we only need the paths for the copy operation, change it so that only the paths are passed.

Ideally this would instead be stored in FDA or whatever listener we have for the folder picker,
rather than passed back and forth between the folder picker.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>

* Convert FolderPickerActivity to Kotlin (step 1)

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>

* FolderPickerActivity: convert to Kotlin step 2

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>

* OCFileListFragment: deduplicate copy/move code

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-05 07:47:18 +00:00
Tobias Kaminsky
efb26fc43a
Merge pull request #10479 from nextcloud/fixRebaseCommand 
wrong indentation
 2022-07-05 08:49:52 +02:00
tobiasKaminsky
e656e06acd
wrong indentation 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-05 08:49:01 +02:00
tobiasKaminsky
3e387c441a
New screenshot for com.owncloud.android.ui.activity.FolderPickerActivityIT_open 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-04 15:49:55 +02:00
Tobias Kaminsky
5cdace49ca
Merge pull request #10472 from nextcloud/thumbnailUpdateEnforced 
When thumbnail update enforced, do not use any cached version
 2022-07-04 14:36:43 +02:00
tobiasKaminsky
7ee18b735b
Shared -> OnDevice -> now correct message 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-04 11:45:41 +02:00
tobiasKaminsky
a981db2200
When thumbnail update enforced, do not use any cached version 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-04 10:00:28 +02:00
Álvaro Brey
fb8c6f4f23
Merge pull request #10471 from nextcloud/fix-flaky-logger-test 
Fix flaky Logger overflow test
 2022-07-04 09:01:58 +02:00
Nextcloud bot
d6cf7a97a3
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-04 04:09:52 +00:00
Chris Narkiewicz
98230e1296
Fix flaky Logger overflow test 
Load event is processed before overlow condition check can
result in warning log line being appended. This resulted
in a race condition.

We simply poll the log file until we either find interesting
log line or we give up after several seconds.

Fixes #10416

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
 2022-07-04 00:30:30 +01:00
Tobias Kaminsky
29390e1fe0
Merge pull request #10464 from nextcloud/repo-sync/android-common/master 
🔄 Synced file(s) with nextcloud/android-common
 2022-07-01 09:38:30 +02:00
nextcloud-android-bot
81fae4d71b 🔄 Synced local '.github/workflows/' with remote 'config/workflows/' 
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
 2022-07-01 07:06:35 +00:00
Álvaro Brey
5cb0056db3
Merge pull request #10457 from nextcloud/dependabot/gradle/androidx.fragment-fragment-ktx-1.5.0 
Bump fragment-ktx from 1.4.1 to 1.5.0
 2022-06-30 11:35:54 +02:00