AndyScherzinger
|
f05a64b01a
|
Revert "remove unused variable"
This reverts commit 4fdda248459830271689697b890a7da1fb80fce4.
|
2017-08-08 12:59:46 +02:00 |
|
AndyScherzinger
|
54744078aa
|
remove unused code, fix compile error
|
2017-08-08 12:59:45 +02:00 |
|
Mario Danic
|
30656a11dc
|
Better handling of files on sd card
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:45 +02:00 |
|
Mario Danic
|
f66cda8d73
|
Prevent several rescans in a row
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:45 +02:00 |
|
Mario Danic
|
b64fc0a4da
|
Fix a typo
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:44 +02:00 |
|
Mario Danic
|
fb3e97bf10
|
Add expert mode
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:44 +02:00 |
|
Mario Danic
|
d099e7e52f
|
Fix up uploads menu
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:44 +02:00 |
|
Mario Danic
|
fc3e981fe7
|
Fix sd card stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:43 +02:00 |
|
Mario Danic
|
158b12df71
|
Fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:43 +02:00 |
|
Mario Danic
|
3338bead87
|
Update lib version
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:43 +02:00 |
|
Mario Danic
|
baf7d1e732
|
Return uploads control
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-08-08 12:59:42 +02:00 |
|
Mario Danic
|
cb5ef79176
|
Revert "Delete right button"
This reverts commit d8cbb904adf1f013b0b8b0ad6d377b35caaec006.
|
2017-08-08 12:59:42 +02:00 |
|
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 |
|