Commit graph

8444 commits

Author SHA1 Message Date
Mario Danic
2092a010b1
Revert "Remove uploads menu"
This reverts commit 92204c4367ef4e69e814c54c601a35b9d7c2a880.

Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
2017-08-08 12:59:42 +02:00
Mario Danic
853d0bf197
Update library
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:41 +02:00
Mario Danic
dd9582bf86
Fix failure
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:41 +02:00
Mario Danic
77618aa6a8
Update gradle
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:41 +02:00
Mario Danic
dcde2d6a80
Implement migration path
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:41 +02:00
AndyScherzinger
7ca9548359
make locl path only choosable for custom folders on creation 2017-08-08 12:59:40 +02:00
AndyScherzinger
404aca19c9
fix lint error 2017-08-08 12:59:40 +02:00
Mario Danic
05fe12b92d
More work
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:40 +02:00
Mario Danic
74fe115087
Fix result stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:39 +02:00
Mario Danic
157ceaba60
Bit of work on uploads
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:39 +02:00
Mario Danic
1ca744b28f
Different retry method
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:38 +02:00
AndyScherzinger
8848f99880
fixes after rebase 2017-08-08 12:59:38 +02:00
Mario Danic
6d7565dc6f
Fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:38 +02:00
Mario Danic
fac7c0eafb
Try to fix 4g
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:37 +02:00
Mario Danic
95d75c5bb0
Pause jobs if magic is changed
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:37 +02:00
Mario Danic
7266b533c5
New stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:37 +02:00
AndyScherzinger
09f6037b86
further cleanup after rebase 2017-08-08 12:59:36 +02:00
AndyScherzinger
3730883136
scrollable toolbar implementation for auto upload 2017-08-08 12:59:36 +02:00
AndyScherzinger
160feb9711
fix after rebase 2017-08-08 12:59:36 +02:00
AndyScherzinger
83deeb203c
fixes after rebase 2017-08-08 12:59:35 +02:00
Mario Danic
1931baa761
Improve upload errors
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:35 +02:00
Mario Danic
9182b0a7a8
Fix modified files
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:35 +02:00
Mario Danic
5226330170
Revert "Try to fix 4G"
This reverts commit ec7751ff21e5e5facb9cde94e3dc5cc6c246cc48.

Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:34 +02:00
tobiasKaminsky
9052abd9dd
rename "foldersync" -> "syncedFolder(s)" 2017-08-08 12:59:34 +02:00
tobiasKaminsky
542e1dc62e
- loading task not necessary
- moved syncFolderItems to local
2017-08-08 12:59:33 +02:00
tobiasKaminsky
1386726a4f
show "add folder" correctly if other folders are present 2017-08-08 12:59:33 +02:00
tobiasKaminsky
1f85abbe43
"set up custom folder" as element in xml and not in adapter 2017-08-08 12:59:33 +02:00
Mario Danic
d7d6dcda41
Try to fix 4G
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:32 +02:00
Mario Danic
bfcc1c5aa0
Fix folder fetch
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:32 +02:00
Mario Danic
62d23975a2
Prevent saturation of retried jobs
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:32 +02:00
Mario Danic
d658be5d34
Move things around
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:31 +02:00
Mario Danic
4adb7935b5
Hack to speed up uploads on wifi
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:31 +02:00
Mario Danic
595c8a7815
Use overwrite when updating file
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:31 +02:00
Mario Danic
98480ee4dc
Hopefully fix retries
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:30 +02:00
Mario Danic
628073fe0e
Fix crash
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:30 +02:00
Mario Danic
f8929a3193
Show current account in uploads only
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:30 +02:00
Mario Danic
a380b3bbcf
Clean up some code
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:30 +02:00
Mario Danic
7ac07ab08a
Implement retry of manual uploads
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:29 +02:00
Mario Danic
5227513daa
Remove new auto upload job
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:29 +02:00
Mario Danic
006b62cd4e
Remove uploads menu
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:29 +02:00
AndyScherzinger
8a39192076
fix list updates 2017-08-08 12:59:28 +02:00
AndyScherzinger
db89c3a19c
fix merge media folder merge 2017-08-08 12:59:28 +02:00
AndyScherzinger
5bffb9aaec
extract check permissions to private helper method 2017-08-08 12:59:27 +02:00
AndyScherzinger
edda5a7807
codacy fixes 2017-08-08 12:59:27 +02:00
Mario Danic
ba5ef73d47
Fix a crashing bug
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:27 +02:00
Mario Danic
8cabe1f3d9
Try to workaround disappeared files bug
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:27 +02:00
Mario Danic
5087ff4537
Delete right button
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:26 +02:00
Mario Danic
447e6fd7ee
Fix custom folders
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:26 +02:00
Mario Danic
8959a72f81
Revert gradle
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:26 +02:00
Mario Danic
812ad18881
Fix rotation crash
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:25 +02:00