Commit graph

8277 commits

Author SHA1 Message Date
Mario Danic
aff05ef57f
Update from legacy
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:53 +02:00
Mario Danic
1066512ef2
Fix merge
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:52 +02:00
Mario Danic
2af9039c50
Remove instant upload screen
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/Preferences.java
2017-08-08 12:59:52 +02:00
Mario Danic
8dfdf92118
Clarify receivers
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:52 +02:00
Mario Danic
c1c3775752
Network receivers & Pre-JellyBeanMR1 charging
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:51 +02:00
Mario Danic
360f1ec1b3
Fix retries
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:51 +02:00
Mario Danic
3c79642bb3
Stop trimming uploads
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:51 +02:00
Mario Danic
9766c24db9
Codacy stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:50 +02:00
Mario Danic
6a47a2fe01
Simplify
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:50 +02:00
Mario Danic
4c50bb999c
Fix stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:50 +02:00
Mario Danic
7c6245a6b7
Update methods
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:49 +02:00
Mario Danic
c3daf45f74
Update for N
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:49 +02:00
Mario Danic
4d8cb93e42
Remove persistance
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:49 +02:00
Mario Danic
9480c42c72
Revert chunked stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:48 +02:00
Mario Danic
1e472fc701
Lower delay
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:48 +02:00
Mario Danic
60d2de4f0d
Simplify file visitor
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:48 +02:00
Mario Danic
9b4b90cc8d
Proper way to schedule
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:47 +02:00
Mario Danic
a5a6476e00
Better handling
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:47 +02:00
Mario Danic
22b1fb0625
Clean up job
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:47 +02:00
Mario Danic
1360e6c536
First batch of magic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:46 +02:00
AndyScherzinger
57896a89bd
remove unused code 2017-08-08 12:59:46 +02:00
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