Commit graph

3655 commits

Author SHA1 Message Date
Joris Bodin
1ec71927df
New color, white for light theme and grey for dark theme. New progressbar
Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
2020-04-23 20:30:27 +02:00
Kilian Périsset
9c6105e94c
Fixed bug relative to inflating (due to < API 21)
This reverts commit a92725f8a7.

Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
2020-04-23 18:14:38 +02:00
Chris Narkiewicz
d0a6fdc2da
Start files sync job when enabling auto upload
This is #5885 solution ported to BackgroundJobManager API.

Fixes #5882
Fixes #5898

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-04-23 10:45:02 +01:00
Chris Narkiewicz
77c4a3e6a5
Migrate file sync related jobs to WorkManager API
* FilesSyncJob.java converted to FilesSyncWork.kt
* FilesSyncJob removed from code
* Extended ETM screen to allow scheduling immediate
  TestJob (for development experimentation)
* OfflineSyncJob.java conveted to OfflineSyncWork.kt
* OfflineSyncJob removed from code
* Fixed re-scheduling of content observer work
* MediaFoldersDetectionJob.java converted to
  MediaFoldersDetectionWork.kt
* MediaFolderDetectionJob removed from code

Fixes #5881

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-04-23 10:45:01 +01:00
Tobias Kaminsky
5da1b7f8a9
Merge pull request #5874 from nextcloud/bounycastle
Switch to bouncycastle
2020-04-23 08:38:48 +02:00
tobiasKaminsky
31fe35906e
Switch to bouncycastle
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-22 20:29:10 +02:00
Joris Bodin
4491f9a40d
Remove unused class
Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
2020-04-22 17:14:45 +02:00
Kilian Périsset
a92725f8a7
Replaced colors by native Android ones
Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
2020-04-22 16:08:56 +02:00
Tobias Kaminsky
2dc5fcaef0
Merge pull request #5887 from nextcloud/transfer
close SSO streams
2020-04-22 14:05:36 +02:00
Kilian Périsset
9fc40c61f0
Formated the code (applied DRY principle)
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-21 09:10:12 +02:00
Kilian Périsset
5942e4e661
Resolved the crash when account is not new (Auth)
Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-04-21 09:03:57 +02:00
David Luhmer
d4bc9b3cf2
refactorings
Drone: update FindBugs results to reflect reduced error/warning count [skip ci]

Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-04-20 15:00:31 +02:00
tobiasKaminsky
3a9d9e8c23
close SSO streams
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-20 15:00:26 +02:00
Andy Scherzinger
aa9e80f0a7
Merge pull request #5876 from nextcloud/releaseConnections
Release connections after usage
2020-04-16 18:15:25 +02:00
Tobias Kaminsky
47d5552af8
Merge pull request #5741 from nextcloud/fix-#5736master
Readd enableAccountHandling for show slider
2020-04-16 12:48:10 +02:00
Tobias Kaminsky
c42d12cc6f
Merge pull request #5848 from goforbg/master
[FIX: #5752] Upload files: too much whitespace
2020-04-16 12:00:32 +02:00
tobiasKaminsky
db3bd029ca
code formatting
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-15 19:12:16 +02:00
Joachim Meyer
32da47d6a3
Make the name collision policy for auto uploads selectable, fixes #5599.
Signed-off-by: Joachim Meyer <joachim@joameyer.de>
2020-04-15 19:12:06 +02:00
tobiasKaminsky
4b30ed5993
Release connections after usage
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-15 17:44:17 +02:00
tobiasKaminsky
352dbd575c
fix https://github.com/nextcloud/android/issues/5457
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-15 15:05:58 +02:00
Tobias Kaminsky
0a2e59d63e
Merge pull request #5839 from nextcloud/showAllFiles
show all files when clicking on show files
2020-04-14 14:52:29 +02:00
Chris Narkiewicz
16bb8d3dfc
Don't put User model into ConflictsResolveActivity account extra
User model has been put into Intent instead of Account,
causing a crash. Convert User into Account before setting
extras parameters.

Fixes #5849

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-04-12 13:26:08 +01:00
techydevil
b4db8d8f95 [FIX: #5752] Upload files: too much whitespace 2020-04-11 16:20:37 +05:30
Tobias Kaminsky
517437eba9
Merge pull request #5761 from nextcloud/ezaquarii/migrate-file-downloader-service-to-user-model
Migrate FileDownloader server to User model
2020-04-09 15:08:26 +02:00
Tobias Kaminsky
1013b6b977
Merge pull request #5707 from nextcloud/fixOOMduringImages
Fix OOM during image browsing
2020-04-09 13:27:09 +02:00
tobiasKaminsky
45315f1486
Fix OOM during image browsing
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-09 10:16:58 +02:00
Andy Scherzinger
d251fbb556
Merge pull request #5838 from nextcloud/tintSSO
Do not tint dialog
2020-04-09 09:13:48 +02:00
tobiasKaminsky
d10403bd3c
show all files when clicking on show files
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-09 09:06:29 +02:00
tobiasKaminsky
886e28bfc2
Do not tint dialog
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-09 08:07:41 +02:00
Andy Scherzinger
a445602f2d
Merge pull request #5760 from nextcloud/ezaquarii/migrate-choose-rich-documents-template-dialot-to-new-user-model
Migrate ChooseRichDocumentsTemplateDialogFragment to User
2020-04-08 20:52:20 +02:00
Chris Narkiewicz
a07cc68573
Migrate FileDownloader server to User model
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-04-08 15:03:49 +01:00
Chris Narkiewicz
29cffa4a24
Log exception in ContactsImportWork catch block
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-04-08 14:34:57 +01:00
Tobias Kaminsky
1d8e5a2648
Merge pull request #5757 from nextcloud/ezaquarii/migrate-edit-share-fragment-to-user
Migrate EditShareFragment to new User model
2020-04-08 13:47:35 +02:00
Tobias Kaminsky
43c6daadcc
Merge pull request #5756 from nextcloud/ezaquarii/migrate-contacts-import-job-to-worker-api
Migrate contacts import job to new API
2020-04-08 13:47:20 +02:00
Andy Scherzinger
ca2420e1d6
codacy: Avoid unused local variables
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-04-08 12:39:37 +02:00
Andy Scherzinger
e9bdd81029
codacy: Avoid unused method parameters
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-04-08 12:39:36 +02:00
Andy Scherzinger
6fc6b6e4a3
reformat code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-04-08 12:39:35 +02:00
Andy Scherzinger
86ca6d5cf8
codacy: Unnecessary use of fully qualified name
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-04-08 12:39:34 +02:00
Andy Scherzinger
92ae5122b0
codacy: Avoid unused private fields 2020-04-08 12:39:33 +02:00
Andy Scherzinger
4795aa1571
codacy: Avoid unused imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-04-08 12:39:22 +02:00
Andy Scherzinger
2c9b0758e4
Merge pull request #5748 from nextcloud/ezaquarii/remove-deprecated-contacts-backup-job
Remove deprecated contacts backup job
2020-04-08 12:37:45 +02:00
tobiasKaminsky
3b13c7156a
check if at least one account is set up, before receiving files
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-08 08:13:01 +02:00
Tobias Kaminsky
f8a5643eca
Merge pull request #5754 from nextcloud/empty
Show loading instead of empty content
2020-04-08 07:49:18 +02:00
tobiasKaminsky
6f5b671d8c
Directly show loading spinner
show "no files" only if folder is known to be empty

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-08 06:56:18 +02:00
tobiasKaminsky
949a5c3a4f
Fix crash while showing ConflictDialog
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-08 06:38:22 +02:00
tobiasKaminsky
c43b234ae4
Rich workspaces: can be null (if disabled), or string (empty or with content)
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-07 16:57:40 +02:00
tobiasKaminsky
54134c43b2
Search: only parse search if search event is there
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-07 13:33:26 +02:00
tobiasKaminsky
4ea0892630
NC18+: add possibility to set expiration date on user/group shares
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-06 15:34:09 +02:00
Andy Scherzinger
61c8cd76dd
Merge pull request #5772 from nextcloud/wrongTextOpening
First use preferred mimetypes, then editor for optional mimetypes
2020-03-30 22:35:43 +02:00
Andy Scherzinger
c6be91a096
Merge pull request #5775 from nextcloud/fallbackIfNoLocal
if no offline editor is available, use OO/Cool/Text
2020-03-30 20:06:30 +02:00
tobiasKaminsky
d3f3b98be0
if no offline editor is available, use OO/Cool/Text
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-30 16:12:16 +02:00
tobiasKaminsky
12a6cdfcea
edit downloaded md/text file is working now
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-30 14:13:09 +02:00
tobiasKaminsky
456ae330dd
First use preferred mimetypes, then editor for optional mimetypes
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-30 13:15:37 +02:00
Chris Narkiewicz
5204ba7541
Migrate contacts import job to new API
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-28 22:07:03 +00:00
Chris Narkiewicz
6f34899327
Migrate ChooseRichDocumentsTemplateDialogFragment to User
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-28 12:51:12 +00:00
Chris Narkiewicz
ba1c2f517c
Migrate EditShareFragment to new User model
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-28 00:48:11 +00:00
Chris Narkiewicz
1e17af8a75
Migrate UserListAdapter to new User model
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-26 19:45:58 +00:00
Chris Narkiewicz
1a26399051
Remove deprecated contacts backup job
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-26 19:06:47 +00:00
Joris Bodin
4cd105d5ec
Readd enableAccountHandling for show slider
Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>
2020-03-26 09:25:02 +01:00
Tobias Kaminsky
b04c09e82b
Merge pull request #5695 from nextcloud/actImage
fix activity image loading
2020-03-23 06:48:11 +01:00
Daniel Bailey
19a5bc2f60
Fix for sso Grant/Deny dialog text color in dark mode.
Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2020-03-22 11:50:06 +00:00
tobiasKaminsky
c0c631fe64
fix activity image loading
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-19 20:33:48 +01:00
tobiasKaminsky
7eb0f66079
Add circle support for searching / displaying
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-19 19:12:23 +01:00
Daniel Bailey
7d2ad3afda
Fixes "Report a bug" button in community tab
Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2020-03-19 15:14:33 +00:00
tobiasKaminsky
1f805e5a57 Tint buttons in upload
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-19 14:48:29 +00:00
Daniel Bailey
28d35f26af Dark Mode Improvements
Removes conflicts between high contrast server themes and the dark mode.
Made primaryAccentColor() aware of the device theme so that it can
adjust the lightness accordingly.
Switch preference's track and thumb are more visible in device dark
mode.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2020-03-19 14:48:04 +00:00
tobiasKaminsky
4bf40b5860
fix wrong assumption how conflict dialog show work
updated tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-17 09:49:59 +01:00
Andy Scherzinger
682ed36006
Merge pull request #5629 from nextcloud/shareSize
adjust share size
2020-03-12 18:04:37 +01:00
Tobias Kaminsky
e1b0b521f9
Merge pull request #5482 from nextcloud/ezaquarii/migrate-contacts-backup-job-to-worker-api
Migrate contacts backup job to new background job manager API
2020-03-12 14:34:16 +01:00
Andy Scherzinger
6df2d58de5
Merge pull request #5634 from nextcloud/previewGradient
Add gradient to preview images in toolbar
2020-03-12 08:14:58 +01:00
Tobias Kaminsky
7ab1377744
Merge pull request #5623 from nextcloud/backButton
tint back button correctly
2020-03-12 07:38:26 +01:00
Tobias Kaminsky
c77f212fab
Merge pull request #5626 from nextcloud/darkRename
Correct font color in dark mode
2020-03-12 07:38:01 +01:00
Tobias Kaminsky
7b5e3607aa
Merge pull request #5632 from nextcloud/sortCrash
fix crash when sorting in folder picker
2020-03-12 07:37:30 +01:00
Chris Narkiewicz
500fdb919b
Migrate contacts backup job to new background job manager API
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-11 23:16:56 +00:00
Andy Scherzinger
2ede91bceb
Merge pull request #5625 from nextcloud/disabledFAB
Fix border of disabled FAB
2020-03-11 20:09:09 +01:00
Andy Scherzinger
ed8ef97ec3
add gradient to preview images in toolbar
Resolves #2883

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-11 18:48:38 +01:00
Andy Scherzinger
287ff2532e
Merge pull request #5612 from nextcloud/space
Fix exception on computing available space
2020-03-11 16:26:14 +01:00
tobiasKaminsky
221d3cc327
fix crash when sorting in folder picker
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-11 15:55:00 +01:00
tobiasKaminsky
8cb003b78e
adjust share size
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-11 14:53:37 +01:00
Andy Scherzinger
f7ffbe689f
Merge pull request #5608 from nextcloud/accountSwitchingTest
Fix account switching
2020-03-11 14:13:56 +01:00
tobiasKaminsky
52ba845e86
Correct font color in dark mode
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-11 10:43:43 +01:00
tobiasKaminsky
1b5d37b50c
Fix border of disabled FAB
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-11 10:06:21 +01:00
tobiasKaminsky
58ae52d108
tint back button correctly
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-11 08:39:58 +01:00
Andy Scherzinger
4920991618
Merge pull request #5617 from nextcloud/allFiles
All files shows root again
2020-03-11 00:00:59 +01:00
Andy Scherzinger
e891411a56
Merge pull request #5614 from nextcloud/postEncoding
Use UTF8 PostMethod everywhere
2020-03-10 22:52:20 +01:00
tobiasKaminsky
25a67fe4cb
All files shows root again
annotated functions with correct NonNull

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-10 11:56:34 +01:00
tobiasKaminsky
adae2e48da
Use UTF8 PostMethod everywhere
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-10 10:42:51 +01:00
tobiasKaminsky
3108759dac
Fix exception on computing available space
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-10 08:41:12 +01:00
tobiasKaminsky
14f6353cb3
Integration test for account switching
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-09 15:39:35 +01:00
tobiasKaminsky
593b684d4d
Use view bindings: https://developer.android.com/topic/libraries/view-binding
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-09 11:34:19 +01:00
tobiasKaminsky
8e45d953f1
Fix NPE on restoring file detail sharing fragment
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-09 08:51:23 +01:00
Andy Scherzinger
03c586bd94
remove unused dimens value
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-06 12:49:39 +01:00
Andy Scherzinger
be4efdd8ce
remove unneeded call
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-06 12:49:38 +01:00
Andy Scherzinger
3cfec4e0ba
remove sdk17 checks
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-06 12:49:37 +01:00
Tobias Kaminsky
581c12a867
Merge pull request #5546 from nextcloud/ezaquarii/migrations-manager
Migrations manager
2020-03-06 12:25:23 +01:00
Chris Narkiewicz
1ba288e5e6
Properly signal error when user id migration fails
Previous implementation was returning success status
when *any* account was migrated, despite possible
failures.

Return error when any account fails to be migrated.

The migration remines idempotent and can be re-run
again, until if finally succeeds.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-06 10:35:57 +01:00
Chris Narkiewicz
9ef27576e1
Enabled migration manager in MainApp
Migration manager added to DI.

Migration manager called in place of legacy migration code.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-06 10:35:57 +01:00
Chris Narkiewicz
1ab8d98d85
Support for optional migrations
Optional migrations care not causing migration failure
and can be applied again on next application run.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-06 10:35:57 +01:00
Chris Narkiewicz
b87bf1f10e
Migrations manager
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-06 10:35:56 +01:00
tobiasKaminsky
793dd901a2
remove unused class
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-06 09:59:34 +01:00
Tobias Kaminsky
2061207e25
Merge pull request #5531 from nextcloud/fix/AS36
Update to Android Studio 3.6
2020-03-05 09:58:46 +01:00
tobiasKaminsky
30ac72652e
Fix test
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-05 08:22:58 +01:00
tobiasKaminsky
7ca6f304ed
Use proper dialog instantiation
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:04 +01:00
tobiasKaminsky
b8c4c68275
Fixes during CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00
tobiasKaminsky
628e58e65e
Fixe during CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00
tobiasKaminsky
ae08a42f8a
Enhance conflict dialog
- fix bug
- add ui tests
- add instrumented tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00
Tobias Kaminsky
3ae41ec9fa
Merge pull request #5549 from endre-borcsok/bugfix/crash_in_activities
Fixed crash in Activities tab.
2020-03-03 10:30:21 +01:00
Tobias Kaminsky
de7b7f5c06
Merge pull request #5345 from Charon77/deep_link
Allows deep linking to open files
2020-03-03 10:26:06 +01:00
Tobias Kaminsky
1e3c6d1080
Merge pull request #5537 from nextcloud/folderFileString
Split up share internal link
2020-03-03 09:45:22 +01:00
Tobias Kaminsky
3dde163c70
Merge pull request #5496 from nextcloud/fix/5232
properly colorize text preview gradient based on theme (day/night)
2020-03-03 09:44:37 +01:00
tobiasKaminsky
01b1e719ff
delombok everything
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 09:39:28 +01:00
Endre Borcsok
bf7d33066b Fixed crash in Activities tab.
Replaced Toast.makeText() methods to DisplayUtils.showSnackMessage().

Signed-off-by: Endre Borcsok <ebsoftmobile@gmail.com>
2020-03-02 20:49:53 +00:00
tobiasKaminsky
4013c47b48
Show slideshow as new activity
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-02 08:45:33 +01:00
tobiasKaminsky
78adcfb3d6
Split up share internal link
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-27 20:10:51 +01:00
Evans Jahja
0467cc37ca Allows deep linking to open files
Signed-off-by: Evans Jahja <evansjahja13@gmail.com>
2020-02-26 21:26:48 +07:00
Tobias Kaminsky
e1b8d525e5
Merge pull request #5445 from nextcloud/headMethod
add HEAD Method support for SSO
2020-02-21 08:37:16 +01:00
Andy Scherzinger
3ec795f0bf
properly colorize text preview gradient based on theme (day/night)
improve preview textview size/gradient position

Fixes #5232

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-02-20 18:30:59 +01:00
Tobias Kaminsky
be238a3f96
Merge pull request #5471 from nextcloud/richWorkspace18only
Show "add folder info" only if text app is available
2020-02-20 07:49:47 +01:00
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
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
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
tobiasKaminsky
87df2c8e1c
Show "add folder info" only if text app is available
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-14 10:31:23 +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
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
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
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
ebcbf0afac
add HEAD Method support for SSO
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-10 11:56:45 +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
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
Kilian Périsset
f9a47e6b3b
Formated the code 2020-02-05 10:50:44 +01:00
tobiasKaminsky
1bf079d2cd
NAB_NEEDLESS_BOOLEAN_CONSTANT_CONVERSION: Method needlessly boxes a boolean constant
This method assigns a Boxed boolean constant to a primitive boolean variable, or assigns a primitive boolean constant to a Boxed boolean variable. Use the correct constant for the variable desired.

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-05 10:21:56 +01:00
Kilian Périsset
4e16e0431a
Merge branch 'fix/defective-search' of github.com:nextcloud/android into fix/defective-search 2020-02-04 18:23:49 +01:00
Kilian Périsset
8184dbf1ff
Change variables accessibility 2020-02-04 18:20:31 +01:00
tobiasKaminsky
88c4d6d2ab
Merge remote-tracking branch 'origin/fix/not-enough-space-dialog' into fix/not-enough-space-dialog 2020-02-04 11:24:19 +01:00
tobiasKaminsky
b74c9f2517
use correct storage location
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-04 11:24:10 +01:00
Tobias Kaminsky
f7220f4618
Merge pull request #5246 from siebica/master
Fix #2753 "Unresponsive App" error popup when syncing
2020-02-04 10:01:17 +01:00
tobiasKaminsky
f794f230b5
formatting
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-04 09:36:40 +01:00
Tobias Kaminsky
64c253be66
Merge pull request #5089 from cheecodes/master
Add check to make sure cursor is initialized
2020-02-04 09:12:33 +01:00
Tobias Kaminsky
0c272ad1d7
Merge pull request #5231 from nextcloud/roundedCorners
images: slightly rounded corners
2020-02-03 13:47:15 +01:00
tobiasKaminsky
f8ff0e106a
Auth activity with primary white color
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-03 06:08:05 +01:00
Kilian Périsset
badc7c92da
Formated the code of ExtendedListFragment.java
(In order to avoid issues)
2020-01-31 14:59:54 +01:00
Kilian Périsset
00e3ce6217
Removed translations (unneeded for this fix branch)
This reverts commit 938e4a6f44.

Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
2020-01-31 14:54:11 +01:00
tobiasKaminsky
763ee606d1
use radius, and do not only test for it
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-30 21:39:54 +01:00
tobiasKaminsky
82dd14f6bc
extract doubled code
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-30 20:31:45 +01:00
Kilian Périsset
82baea3062
Normalized the code 2020-01-30 16:55:37 +01:00
Tobias Kaminsky
8dc162960b
Merge pull request #5209 from nextcloud/ooDownloadFile
OnlyOffice: make download possible
2020-01-30 15:30:04 +01:00
Kilian Périsset
4bed2adc2f
Merge branch 'fix/not-enough-space-dialog' of github.com:nextcloud/android into fix/not-enough-space-dialog 2020-01-29 10:39:52 +01:00
Kilian Périsset
52edda73f6
Formated the code and removed Pair 2020-01-29 10:39:45 +01:00
tobiasKaminsky
9d5e3da126
Merge remote-tracking branch 'origin/fix/not-enough-space-dialog' into fix/not-enough-space-dialog
# Conflicts:
#	src/main/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragment.java
2020-01-29 08:35:20 +01:00
tobiasKaminsky
8737d9b835
add ui test
- some small code changes
- removed unneeded code

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-28 16:02:19 +01:00
Kilian Périsset
e3c19410c8
Removed redundant code for Codacy grade 2020-01-28 14:05:50 +01:00
Kilian Périsset
1c44f2003d
Removed codacy issues 2020-01-28 13:59:24 +01:00
Kilian Périsset
03a307825d
Finished "Not Enough Space" dialog + Optimized UX 2020-01-27 15:29:46 +01:00
Tobias Kaminsky
b53c96cba0
Merge pull request #5218 from nextcloud/fix_multitask
Fix #5213 app is excluded from recent/current apps
2020-01-27 08:39:05 +01:00
Kilian Périsset
9fac55da6b
Added args for SyncFileNotEnoughSpaceFragment (unfinished)
Caption support is missing
2020-01-24 15:08:03 +01:00
Kilian Périsset
8e09c99f1f
Added dialog when sync is too heavy for device (unfinished) 2020-01-24 14:19:40 +01:00
Andy Scherzinger
e4f099237c
Merge pull request #5203 from nextcloud/directEditingPre5
prevent direct editing on < Lollipop
2020-01-23 18:54:06 +01:00
Kilian Périsset
579140b7c4
Cleaned a bit the code + Fixed cross display bug 2020-01-23 15:54:09 +01:00
Kilian Périsset
938e4a6f44
Added translations to prepare pre-search + Fixed fab bug 2020-01-22 18:58:43 +01:00
tobiasKaminsky
4fb140d275
round corners only in list view
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-22 13:45:31 +01:00
Andy Scherzinger
ce2971386d
Merge pull request #5270 from nextcloud/addSeparator
OC bottom list improvement
2020-01-21 22:46:26 +01:00
Kilian Périsset
10b661744a
Fixed onBackPressed bug (inactive button) + Refactored and optimized the code 2020-01-21 18:09:50 +01:00
tobiasKaminsky
289a83635d
OC bottom list improvement
- same padding
- add "create new" for creators

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-21 13:01:28 +01:00
tobiasKaminsky
491de101ac
Fix duplicated rich_workspace in dev version
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-21 09:17:34 +01:00
Sebastian-Ion TINCU
531c0187a8 Fix #2753 "Unresponsive App" error popup when syncing
Always start SyncFolderOperations as background services to prevent
ANRs when they take a little more time to complete.

Signed-off-by: Sebastian-Ion TINCU <5282265+siebica@users.noreply.github.com>
2020-01-20 12:56:06 +01:00
Kilian Périsset
2f02f6bdf4
Added locking and unlocking of Drawer in Videos Activities/Fragments 2020-01-20 12:30:02 +01:00
Andy Scherzinger
465b209ec9
Merge pull request #5216 from nextcloud/fix/lock-drawer-in-medias-activities
Locked and hid the drawer in Pictures Preview
2020-01-20 11:02:28 +01:00
tobiasKaminsky
1c483e140d
move create rich workspace into bottom sheet
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-18 18:08:54 +01:00
tobiasKaminsky
ef0b0fe9ee
images: slightly rounded corners
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-18 16:22:54 +01:00
Joris Bodin
97eda02db6
Fix #5213 2020-01-16 18:18:42 +01:00