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
19088 commits 220 branches 1587 tags 639 MiB
Commit graph

19088 commits

This branch
This branch
All branches
Author SHA1 Message Date
Álvaro Brey
690c18506a
Merge pull request #10508 from nextcloud/masterBump3.22 
Bump master to 3.22 Alpha0
 2022-07-12 15:41:53 +02:00
tobiasKaminsky
c06412ab1b
Bump master to 3.22 Alpha0 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-12 08:05:24 +02:00
Tobias Kaminsky
5d0d0039a8
Merge pull request #10418 from nextcloud/fixRenamingFolder 
Fix missing update of storage path, so that files/folders were only locally changed, but update not reflected in UI
 2022-07-12 06:59:03 +02:00
Nextcloud bot
94c1116b52
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-12 04:12:12 +00:00
tobiasKaminsky
82fcf2e3a0
Fix missing update of storage path, so that files/folders were only locally changed, but update not reflected in UI 
add IT test

update search lists after renaming

extract string to variable

Remove local/storageManager files after each test run

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-11 15:19:56 +02:00
Álvaro Brey
458ee43f17
Merge pull request #10390 from nextcloud/deletedEncryptedSubfolder 
Deleted encrypted subfolder
 2022-07-11 11:55:24 +02:00
Álvaro Brey
c1f53e65de
EndToEndRandomIT: create keys before all tests 
Fixes inconsistencies due to keys created at wrong time

Co-authored-by: Tobias Kaminsky <tobias@kaminsky.me>

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-11 11:16:23 +02:00
tobiasKaminsky
bcfa832309
find out why reInit fails 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-11 09:27:11 +02:00
tobiasKaminsky
6325d07800
Test for delete folder 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-11 09:27:11 +02:00
tobiasKaminsky
3cae976597
Allow to delete encrypted folders 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-11 09:27:11 +02:00
Tobias Kaminsky
d31f3f7988
Merge pull request #10483 from nextcloud/fix/share-link-email-crash 
FileDetailsSharingProcessFragment: avoid crashing when modifying existing shares
 2022-07-11 07:54:19 +02:00
Nextcloud bot
9c60c2d636
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-11 04:09:57 +00:00
Nextcloud bot
603b3b1f83
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-10 04:12:07 +00:00
Nextcloud bot
56cabe6174
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-09 04:09:56 +00:00
Álvaro Brey
9445a6c3e3
OCFileListFragment: remove all the "resetHeaderScrollngState" calls 
Now handled with a listener in FileDisplayActivity

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-08 16:41:17 +02:00
Tobias Kaminsky
f6a99ef9ca
Merge pull request #10357 from nextcloud/warnOnExistingFile 
When during renaming the same name already exists in same folder: show an error, disable confirm button
 2022-07-08 08:38:31 +02:00
Tobias Kaminsky
546f69cfe4
Merge pull request #10490 from nextcloud/endlessRefresh 
add broadcastReceiver when switching from media -> on device
 2022-07-08 08:34:26 +02:00
Nextcloud bot
94569b0e12
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-08 04:11:30 +00:00
Tobias Kaminsky
97e220a83f
Merge pull request #10481 from nextcloud/fix/share-link-crash 
FileActivity: fix crash when creating share link from FileDetailsFragment
 2022-07-07 14:34:09 +02:00
Tobias Kaminsky
f253876d57
Merge pull request #10487 from nextcloud/fix/folder-picker-activity-menu 
FolderPickerActivity: call super.onCreateOptionsMenu inside overriding method
 2022-07-07 14:32:49 +02:00
Tobias Kaminsky
4fc60c2ae1
Merge pull request #10489 from nextcloud/fix/crash-status-dialog-darkmode 
SetStatusDialogFragment: fix nullability of itemSelected parameter
 2022-07-07 14:32:10 +02:00
tobiasKaminsky
c3fd318437
add broadcastReceiver when switching from media -> on device 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-07 14:20:41 +02:00
Tobias Kaminsky
5baa1c8f45
Merge pull request #10484 from nextcloud/media-view-options 
Media view filter options
 2022-07-07 12:14:15 +02:00
Álvaro Brey
1b968c2695
SetStatusDialogFragment: fix nullability of itemSelected parameter 
Prevents crash when fragment is recreated (like when switching dark mode)

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2022-07-07 11:46:25 +02:00
tobiasKaminsky
389e33d524
correct formatting 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-07 10:17:54 +02:00
tobiasKaminsky
bb69f8cb86
use sets instead of lists 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-07 10:06:26 +02:00
tobiasKaminsky
27f716109d
When during renaming the same name already exists in same folder: show an error, disable confirm button 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-07-07 10:06:24 +02:00
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