Alice Gaudon
49f3a67251
ConflictsResolveActivity: code style and readability improvements
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-18 07:39:13 +01:00
Alice Gaudon
6540e3ef71
Upload list conflicts: replace trash icon with menu and add resolve action
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
a4ff1f11d7
Customize upload sync conflict notification strings
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
e77ffa00a8
Fix synced folder layout form control widgets alignment
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
91ef307e7a
Fix database migration of field forceOverwrite to NameCollisionPolicy
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
52d089b18a
FileUploader: fix codacy issues and SpotBugs
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
ec27f840a6
FileUploader: code cleanup
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
7713a28a4f
FileUploader: require explicit NameCollisionPolicy and change default used value
...
- Changes NameConflictPolicy for manual uploads from default RENAME to ASK_USER
- Removal of helper class FileUploader.UploadRequester (methods become static and go to FileUploader)
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
6783e8ab4c
Make file uploads ask the user what to do when the file already exists on remote
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:16 +01:00
Alice Gaudon
213002f44e
Make newly created synced folders auto upload existing files by default
...
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:37:54 +01:00
Chris Koying Browet
1b7bd72c49
ADD: [instantupload] setting to also upload existing files
...
Signed-off-by: Chris Koying Browet <cbro@semperpax.com>
2020-02-18 07:37:54 +01:00
Tobias Kaminsky
c243453168
Merge pull request #5465 from nextcloud/fix/create-folder-crash-autosync
...
Fixed crash during folder creation (autosync)
2020-02-18 07:28:12 +01:00
tobiasKaminsky
a93313ca19
added tests
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-17 15:05:14 +01:00
Kilian Périsset
467104c455
Replaced OCFile by File in getFolder() method
2020-02-17 14:45:14 +01:00
Kilian Périsset
c59f9c0b91
Formated the code + added header
2020-02-17 14:45:07 +01:00
Kilian Périsset
389090d3e8
Implemented tests for FolderPickerActivity
2020-02-17 14:45:07 +01:00
Kilian Périsset
511a16612d
Fixed bug relative to null folder in FolderPicker
2020-02-17 14:45:07 +01:00
Tobias Kaminsky
4616b0d40b
Merge pull request #5447 from nextcloud/ezaquarii/migrate-jobs-to-new-user-model
...
Migrate jobs to new user model
2020-02-17 10:40:04 +01:00
Chris Narkiewicz
0977c37916
Fix crash during text file creation
...
Fixes #5330
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-17 09:30:37 +01:00
Nextcloud bot
5c74f2b1be
[tx-robot] updated from transifex
2020-02-16 03:28:46 +00:00
Nextcloud bot
27fabe745b
[tx-robot] updated from transifex
2020-02-15 03:29:51 +00:00
Andy Scherzinger
490b292ad9
Merge pull request #5300 from nextcloud/sharedSearchAgain
...
Re-enable shared search and add ui test for list shares
2020-02-14 13:52:18 +01:00
tobiasKaminsky
7b4e1b82e3
change cancelContactBackupJobForAccount to user new User class
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-14 11:08:38 +01:00
Chris Narkiewicz
0afc2645c4
Migrated jobs to new user model
...
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-02-14 06:22:20 +00:00
Nextcloud bot
68f06ea158
[tx-robot] updated from transifex
2020-02-14 03:28:53 +00:00
tobiasKaminsky
eefeda930c
Add square google icon
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-13 15:32:24 +01:00
Nextcloud bot
7156aaff2a
[tx-robot] updated from transifex
2020-02-13 03:33:37 +00:00
Tobias Kaminsky
a063f32d25
Merge pull request #5434 from nextcloud/ezaquarii/migrate-account-list-to-new-user-model
...
Migrate account list to new user model
2020-02-12 12:18:00 +01:00
tobiasKaminsky
0569b0de65
Screenshot tests ManageAccountsActivity
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-12 09:34:59 +01:00
Chris Narkiewicz
53024d1cd1
Migrate account list to new user model
...
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-02-12 07:31:38 +00:00
Nextcloud bot
e716c99a9b
[tx-robot] updated from transifex
2020-02-12 03:28:27 +00:00
Tobias Kaminsky
f520f2f9a2
Merge pull request #5436 from nextcloud/ezaquarii/make-user-model-parcelable
...
Make user model parcelable
2020-02-11 09:26:26 +01:00
tobiasKaminsky
26d7b9c692
Fix after rebase
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-11 08:58:31 +01:00
tobiasKaminsky
c2750aabda
Add ui test for list shares
...
add test user to drone
switch back to master
use "waitForIdleSync" instead of sleep
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-11 08:57:09 +01:00
Nextcloud bot
87eb8e0d16
[tx-robot] updated from transifex
2020-02-11 03:31:50 +00:00
Chris Narkiewicz
4ce54bc21e
Make user model parcelable
...
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-02-10 15:49:12 +00:00
Tobias Kaminsky
5905b1c5a5
Merge pull request #5432 from nextcloud/ezaquarii/migrate-drawer-menu-utils-to-new-user-model
...
Migrate drawer menu utilities to new user model
2020-02-10 12:41:25 +01:00
Tobias Kaminsky
4be18adc2d
Merge pull request #5064 from nextcloud/ezaquarii/extract-account-logic-from-base-activity-into-mixin
...
Extract account logic from BaseActivity into a mixin
2020-02-10 12:33:04 +01:00
tobiasKaminsky
6048243f41
Fix crash: Caused by: java.lang.ClassCastException: java.lang.Object[] cannot be cast to java.lang.Void[]
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-10 08:41:51 +01:00
Nextcloud bot
0027df9d0c
[tx-robot] updated from transifex
2020-02-10 07:30:30 +00:00
tobiasKaminsky
b4db9d07af
do not break line on transifex
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-10 08:23:41 +01:00
Chris Narkiewicz
b5fb9c1374
Migrate drawer menu utilities to new user model
...
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-02-09 10:11:08 +00:00
Chris Narkiewicz
26f2d52a5a
Extract account logic from BaseActivity into a mixin
...
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-02-05 22:08:58 +00:00
Andy Scherzinger
c7669fe9db
Merge pull request #5393 from nextcloud/removeUnsetType
...
Remove UnsetType as we do not have bottom bar anymore…
2020-02-05 15:17:44 +01:00
Tobias Kaminsky
c5be0ad7e4
Merge pull request #5399 from nextcloud/extractArbitraryDataSet
...
extract ArbitraryDataSet class
2020-02-05 12:30:37 +01:00
Tobias Kaminsky
0936945b3c
Merge pull request #5328 from nextcloud/fix/not-enough-space-dialog
...
Added "not enough space dialog"
2020-02-05 12:14:40 +01:00
tobiasKaminsky
778fec9e21
extract openDrawer test into AbstractIT
...
rebased
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-05 11:12:48 +01:00
tobiasKaminsky
e118f9a516
Remove UnsetType as we do not have bottom bar anymore…
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-05 11:09:14 +01:00
tobiasKaminsky
c7ea6458bf
extract ArbitraryDataSet class
...
cleanup
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-05 10:58:05 +01:00
Tobias Kaminsky
7c84a9f929
Merge pull request #5296 from nextcloud/fix/defective-search
...
Fixed defective search
2020-02-05 10:56:19 +01:00
