Commit graph

1383 commits

Author SHA1 Message Date
AndyScherzinger
bec836f36a
Fix name to be 2.0.0RC1 2017-08-10 18:33:33 +02:00
AndyScherzinger
381355e9f3
bum version to 2.0.0 RC1 2017-08-10 18:24:07 +02:00
Mario Đanić
ed71cdac9c Merge branch 'master' into lintWarnings 2017-08-10 18:23:02 +02:00
AndyScherzinger
df55791c5d
remove unused code 2017-08-10 16:37:50 +02:00
AndyScherzinger
05b0ff492e
cleanup lang files for further obsolete strings 2017-08-10 16:37:38 +02:00
AndyScherzinger
9ab6f3cd4a
cleanup lang files for further obsolete strings 2017-08-10 16:37:38 +02:00
AndyScherzinger
af35cb50e5
cleanup lang files for further obsolete strings 2017-08-10 16:37:37 +02:00
AndyScherzinger
5b40f120c6
cleanup lang files for lint build 2017-08-10 16:37:37 +02:00
AndyScherzinger
3c43602cd6
revert menu items 2017-08-10 16:37:36 +02:00
AndyScherzinger
0054d7fc92
remove further unused strings 2017-08-10 16:37:36 +02:00
AndyScherzinger
7b8f67ff36
replace ... with proper … 2017-08-10 16:37:36 +02:00
AndyScherzinger
acbf30642a
remove unsued preferences/strings 2017-08-10 16:37:35 +02:00
AndyScherzinger
89fba7f040
remove unused strings 2017-08-10 16:37:35 +02:00
tobiasKaminsky
ffa50ed82d
remove unused ressources 2017-08-10 16:37:34 +02:00
tobiasKaminsky
38657443d8
removed some unused code to get the warnings down ;-) 2017-08-10 16:32:10 +02:00
AndyScherzinger
e30bc9eefc
add object descriptions for accessibility 2017-08-10 16:32:10 +02:00
tobiasKaminsky
91579554a8
remove them in translated files 2017-08-10 16:32:09 +02:00
AndyScherzinger
160fc45c27
remove unsused string 2017-08-10 16:31:46 +02:00
tobiaskaminsky
5535ff3c0e
FileFragment Avoid non default constructors in fragments use a default 2017-08-10 16:31:25 +02:00
tobiaskaminsky
5d4049aab9
add cast 2017-08-10 16:31:24 +02:00
tobiaskaminsky
887c1c4263
PreviewMediaFragment java 124 Avoid non default constructors in fragments use a default 2017-08-10 16:31:20 +02:00
Andy Scherzinger
2b2fb45732 Merge pull request #1292 from nextcloud/autoUploadLight
Make auto upload light working again
2017-08-10 16:27:04 +02:00
tobiasKaminsky
86844523ee
disable expert mode on auto upload light, also no custom folders, doing it right now... 2017-08-10 13:52:20 +02:00
tobiasKaminsky
67c77adf40
removed some unused code to get the warnings down ;-) 2017-08-10 12:34:21 +02:00
tobiasKaminsky
fecc468307
removed some unused code to get the warnings down ;-) 2017-08-10 12:29:42 +02:00
tobiasKaminsky
185887bb42
disable expert mode on auto upload light, also no custom folders 2017-08-10 11:13:04 +02:00
Nextcloud bot
a532e269bd
[tx-robot] updated from transifex 2017-08-10 00:28:25 +00:00
Tobias Kaminsky
46e62cfb80 Merge efd1167ce6 into 43b751605b 2017-08-09 12:15:27 +00:00
tobiasKaminsky
efd1167ce6
make auto upload light working again 2017-08-09 14:14:56 +02:00
Nextcloud bot
43b751605b
[tx-robot] updated from transifex 2017-08-09 00:27:29 +00:00
tobiaskaminsky
4aa189954a
some minor changes 2017-08-08 15:18:37 +02:00
AndyScherzinger
727a7326ee
Revert "minor code cleanups due to code review"
This reverts commit ea6dcaa958a233d29bffd0ee01932b9e75f86122.
2017-08-08 15:18:36 +02:00
AndyScherzinger
dd6bd6f399
organize imports after rebase 2017-08-08 15:18:36 +02:00
AndyScherzinger
a9100e5d8e
minor code cleanups due to code review 2017-08-08 15:18:36 +02:00
Victor Nidens
ec322ff8a8
Sharing menus aren't visible anymore for shared files without resharing permissions #1176 2017-08-08 15:18:35 +02:00
Victor Nidens
a9857b800c
Added warning when trying to reshare a file without necessary permissions 2017-08-08 15:18:35 +02:00
Victor Nidens
0991b14904
Resharing toggle hidden if the resharing is disabled in server settings #1177 2017-08-08 15:18:17 +02:00
tobiaskaminsky
8bd39d9438
LoadingDialog.java:50: Avoid non-default constructors in fragments 2017-08-08 13:23:45 +02:00
tobiaskaminsky
12fd76de5b
fix: ThemeUtils.java:257: AppCompatCheckBox.setSupportButtonTintList can only be called from within the same library group (groupId=com.android.support) 2017-08-08 13:23:45 +02:00
tobiaskaminsky
65e6e0a8e5
replace constant: ../../../src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java:179: Must be one or more of: ... 2017-08-08 13:23:41 +02:00
AndyScherzinger
d10f981b0f
fix folder migration 2017-08-08 13:00:06 +02:00
AndyScherzinger
0ef2739d26
remove further unused code 2017-08-08 13:00:06 +02:00
AndyScherzinger
f812d5b8c3
fix RTL issue 2017-08-08 13:00:05 +02:00
AndyScherzinger
bddce2080d
minor code formatting cleanups 2017-08-08 13:00:05 +02:00
AndyScherzinger
19ec306b8c
remove unused layouts 2017-08-08 13:00:04 +02:00
AndyScherzinger
b82b72f2b3
add content description and rtl fixes 2017-08-08 13:00:03 +02:00
AndyScherzinger
2e947eac61
fix some rtl warnings 2017-08-08 13:00:03 +02:00
AndyScherzinger
d643d28c58
fix codacy warnings 2017-08-08 13:00:03 +02:00
AndyScherzinger
5d2b30d86c
removing unsed reources 2017-08-08 13:00:02 +02:00
AndyScherzinger
7e879f7bcd
lint: remove unused resources 2017-08-08 13:00:02 +02:00
AndyScherzinger
4781c0703f
remove further unused resources 2017-08-08 13:00:02 +02:00
AndyScherzinger
51c17f0614
codacy: remove unused code 2017-08-08 13:00:01 +02:00
AndyScherzinger
953ee85268
file line length 2017-08-08 13:00:01 +02:00
AndyScherzinger
aeda198d5b
CR: use enum instead of Integer 2017-08-08 13:00:00 +02:00
AndyScherzinger
2cb8785fd0
lint: remove hardcoded strings 2017-08-08 13:00:00 +02:00
AndyScherzinger
29ff68bb79
rename icon work that isn't a menu icon 2017-08-08 13:00:00 +02:00
AndyScherzinger
667dd10ac7
remove further unused ressources (lint) 2017-08-08 12:59:59 +02:00
AndyScherzinger
13ecb580f1
remove first batch of unused resources 2017-08-08 12:59:59 +02:00
AndyScherzinger
c3be2fe72f
fix string call 2017-08-08 12:59:58 +02:00
AndyScherzinger
d7ed716468
fix further lint errors 2017-08-08 12:59:58 +02:00
AndyScherzinger
ab9325da3b
fix lint error moving constant to preferences 2017-08-08 12:59:58 +02:00
AndyScherzinger
7f22be5355
fix lint error 2017-08-08 12:59:57 +02:00
AndyScherzinger
fbcfa02142
fix lint errors 2017-08-08 12:59:57 +02:00
AndyScherzinger
21d1c56e4d
fix Combining Ellipsize and Maxlines (lint) 2017-08-08 12:59:56 +02:00
Mario Danic
334a6852c6
Optimize imports
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:56 +02:00
Mario Danic
5e974670b4
Fix review stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:55 +02:00
Mario Danic
934d8ecaf8
Remove resources
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:54 +02:00
Mario Danic
c68f02ec57
Put custom folders intto expert
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:53 +02:00
Mario Danic
1cd5d8dc8a
Remove obsolete methods
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:53 +02:00
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
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
dd9582bf86
Fix failure
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
Mario Danic
27059a9f97
Fix duplicates
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:25 +02:00