mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 09:10:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
14368 commits 221 branches 1589 tags 640 MiB
Commit graph

3415 commits

Author SHA1 Message Date
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