Commit graph

5140 commits

Author SHA1 Message Date
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
Mario Danic
295e35febd
Notify adapter that data changed
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:25 +02:00
Mario Danic
c012c15e05
Fix a bug
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:24 +02:00
Mario Danic
9419ec8d64
Fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:24 +02:00
Mario Danic
b1a5ae9a18
Add custom folder init
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:23 +02:00
Mario Danic
cb4017f095
No manual retry
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:23 +02:00
Mario Danic
26c8e696fc
Add support for retry & custom folders
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:23 +02:00
Mario Danic
a69e7639e6
Some locking magic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:22 +02:00
Mario Danic
9b50b0be89
Updates
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:22 +02:00
Mario Danic
88a68b36c4
Update query
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:22 +02:00
Mario Danic
a40833b99d
Fixes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:21 +02:00
Mario Danic
32cd15d922
Ignore existing files
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:21 +02:00
Mario Danic
5b96a33446
Change of hearts
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:21 +02:00
Mario Danic
9c6dab3238
First commit
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:20 +02:00
AndyScherzinger
6c21e6805d
remove unsused constant 2017-08-08 12:59:20 +02:00
AndyScherzinger
72d2374f8a
properly display multiple configurations for a single folder (image/video/custom) 2017-08-08 12:59:20 +02:00
AndyScherzinger
68622733a1
fix file display of custom folders 2017-08-08 12:59:19 +02:00
AndyScherzinger
1f2aa78869
fix local folder chooser menu NPE 2017-08-08 12:59:19 +02:00
AndyScherzinger
a27d0c15f4
fix create item click for custom folder 2017-08-08 12:59:19 +02:00
AndyScherzinger
b152e32952
local folder picker mode implementation 2017-08-08 12:59:18 +02:00
AndyScherzinger
aff8a86b37
enable/disable save button depending on local/remote folder paths present/chosen 2017-08-08 12:59:18 +02:00
AndyScherzinger
1338f34307
custom folder creation: use custom headline and hide enable-switch 2017-08-08 12:59:18 +02:00
AndyScherzinger
ba17dc47fa
fix index calculation due to new position 0 custom folder create item 2017-08-08 12:59:17 +02:00
Mario Danic
cdf43866ea
Fix the build
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:17 +02:00
AndyScherzinger
efb9c51618
hide delete button for unpersisted custom folders 2017-08-08 12:59:17 +02:00
AndyScherzinger
5b1a8305ed
hide delete button for non-custom folders 2017-08-08 12:59:16 +02:00
AndyScherzinger
78cdab05ac
set sub headline after local path has been chosen 2017-08-08 12:59:16 +02:00
AndyScherzinger
4060527aab
implement delete action 2017-08-08 12:59:16 +02:00
AndyScherzinger
828284330d
fix after rebase 2017-08-08 12:59:15 +02:00
AndyScherzinger
ace7ad03c4
delete button (no function yet) 2017-08-08 12:59:15 +02:00
AndyScherzinger
cd4f6c59e4
fix db upgrade logic after rebase 2017-08-08 12:59:15 +02:00
AndyScherzinger
245bebf71a
correctly persist newly created/configured custom folder and refresh list 2017-08-08 12:59:14 +02:00
AndyScherzinger
127506baf3
added todo where the list refresh should take place 2017-08-08 12:59:14 +02:00
AndyScherzinger
e93cd2723f
implement correct local/remote folder picking in preference dialog 2017-08-08 12:59:14 +02:00
AndyScherzinger
a3985e7227
fix file activity 2017-08-08 12:59:13 +02:00
AndyScherzinger
0c8e99d49d
fix PushUtils after rebase 2017-08-08 12:59:13 +02:00
AndyScherzinger
996e214d5c
fix type 2017-08-08 12:59:13 +02:00
AndyScherzinger
29351f09a2
fix import 2017-08-08 12:59:12 +02:00
AndyScherzinger
b4ebfe0598
folder open icon 2017-08-08 12:59:12 +02:00
AndyScherzinger
de83a02156
open folder sync preference for new, custom folder (work in progress) 2017-08-08 12:59:12 +02:00
Mario Danic
3d43851130
Revert "Maybe fix modified build"
This reverts commit 8dee57a90e3a8d0f7e7282bb0a9e045a0bfd55af.
2017-08-08 12:59:11 +02:00
Mario Danic
908ee017d0
Add onClick
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:11 +02:00
Mario Danic
8ec926697d
Work a bit more on stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:11 +02:00
Mario Danic
4efb17fd1d
Work a bit on locking
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:10 +02:00
Mario Danic
441e5c7511
Acquire wakelocks to make sure all is good
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:10 +02:00
Mario Danic
d18d618ac4
Fix two smaller issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:10 +02:00
Mario Danic
e0cbbd0bf8
Try to fix it
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:09 +02:00
Mario Danic
1b5f0597c4
Try to fix update
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:09 +02:00
Mario Danic
878a8cb7d8
Delete shutdown receiver
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:09 +02:00
Mario Danic
f0c771c2e7
Document new auto upload job
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:08 +02:00
Mario Danic
0bae6fcfb2
Clean up code
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:08 +02:00
Mario Danic
e78d36d2b5
Fix issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:07 +02:00
Mario Danic
e40086d2ab
Add counting magic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:06 +02:00
Mario Danic
6496d7267a
Some work on a new job for AU
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:06 +02:00
AndyScherzinger
20681be134
fix limit variable to prevent NPE 2017-08-08 12:59:06 +02:00
AndyScherzinger
b02d4378fa
db v20 is also on master, v21 now has to be used so development doesn't break 2017-08-08 12:59:05 +02:00
AndyScherzinger
20b05e7ce2
more logging while migrating data. 2017-08-08 12:59:05 +02:00
Mario Danic
08cc99b92b
Clean up in file content provider
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:05 +02:00
Mario Danic
de962ad8b6
Clean up DB upgrade
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:04 +02:00
Mario Danic
582f29b041
Add migration procedures
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:04 +02:00
Mario Danic
378c46f0ec
Enable auto upload for all
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:04 +02:00
Mario Danic
2b313b92f8
Fix all folders
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:03 +02:00
Mario Danic
14c2d13c81
Custom folder RV item
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:03 +02:00
Mario Danic
662b08a12c
Add custom folder icon
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:03 +02:00
AndyScherzinger
48d66b36c9
fixed layout not displaying app bar 2017-08-08 12:59:03 +02:00
AndyScherzinger
4e82f5dc5f
also use star folder for action item 2017-08-08 12:59:02 +02:00
AndyScherzinger
a17e64da25
custom folder icon 2017-08-08 12:59:02 +02:00
AndyScherzinger
d889e32d19
fixes after rebase for DB upgrade routine 2017-08-08 12:59:02 +02:00
AndyScherzinger
9899dbbf13
add item to the top (WiP) 2017-08-08 12:59:01 +02:00
AndyScherzinger
1f0a12bbdc
create folder icon 2017-08-08 12:59:01 +02:00
AndyScherzinger
8e3edb5a19
add folder type to persistent entity 2017-08-08 12:59:01 +02:00
AndyScherzinger
2bd7611a31
fix codacy 2017-08-08 12:59:00 +02:00
AndyScherzinger
3147a2c86a
add icons to the grid headers depending on the type 2017-08-08 12:59:00 +02:00
AndyScherzinger
6916ce5142
simplified thumbnail generation 2017-08-08 12:59:00 +02:00
AndyScherzinger
fbd703b1da
fix video thumbnails 2017-08-08 12:58:59 +02:00
AndyScherzinger
c15c5da2c5
remove logs 2017-08-08 12:58:59 +02:00
AndyScherzinger
e5e68ac3e7
add videos to the list 2017-08-08 12:58:59 +02:00
AndyScherzinger
105ce09649
add video fetching 2017-08-08 12:58:56 +02:00
Nextcloud bot
81cc7eb5d7
[tx-robot] updated from transifex 2017-08-08 10:30:04 +00:00
Nextcloud bot
0ebb3c8ab5
[tx-robot] updated from transifex 2017-08-08 00:27:23 +00:00
Andy Scherzinger
d9a5fecf38 Merge pull request #1265 from nextcloud/ldap
Update user name with correct id found by user ocs call
2017-08-07 18:58:25 +02:00
tobiaskaminsky
95c6272b58
Merge remote-tracking branch 'remotes/origin/master' into 1229_sharing_view 2017-08-07 11:16:56 +02:00
tobiaskaminsky
79c526fa68
Revert "Disable current app in sharing"
This reverts commit ea52edffd2.
2017-08-07 11:15:33 +02:00
tobiaskaminsky
bae6aeedd5
Revert "Fix codacy"
This reverts commit f9b8b4faf8.
2017-08-07 11:14:43 +02:00
Tobias Kaminsky
9765897509 Merge branch 'master' into ldap 2017-08-07 08:32:15 +02:00
Tobias Kaminsky
796fba0354 Merge branch 'master' into clearSuccessfulUploads 2017-08-07 08:14:15 +02:00
Andy Scherzinger
35d0c38c06 Merge pull request #1213 from nextcloud/showEmptyMessageAgain
Show empty message again
2017-08-05 17:28:04 +01:00
Andy Scherzinger
048f88524e Merge pull request #1214 from nextcloud/emptyMessageReceiveExternalFiles
Show empty message when receiving external files
2017-08-05 17:26:36 +01:00
Mario Danic
f9b8b4faf8 Fix codacy
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-05 12:35:11 +02:00
Mario Danic
ea52edffd2 Disable current app in sharing
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-05 11:52:58 +02:00
Mario Đanić
fcee6e3741 Merge pull request #1231 from jsrck/1221-details-page-reappears
Picture "details "page reappear when it shouldn't. #1221
2017-08-05 10:23:00 +02:00
Andy Scherzinger
fa4f7590b0 Merge pull request #1252 from nextcloud/reduceLintErrors
Reduce lint errors
2017-08-05 08:16:44 +01:00
Nextcloud bot
0c49d53a38
[tx-robot] updated from transifex 2017-08-05 00:27:03 +00:00
Tobias Kaminsky
fccf72e7db Merge branch 'master' into reduceLintErrors 2017-08-04 12:46:51 +02:00
tobiasKaminsky
08875fe1e5
update user name with correct id found by user ocs call 2017-08-04 11:54:34 +02:00
tobiasKaminsky
6e327673bb
revert description for clear successful uploads 2017-08-04 07:50:15 +02:00
Andy Scherzinger
75d6de9b7c Merge pull request #1253 from nextcloud/domAPI
Enabling dom storage api
2017-08-03 08:27:18 +01:00
Nextcloud bot
3a00aa8930
[tx-robot] updated from transifex 2017-08-03 00:27:18 +00:00
Nextcloud bot
fc8afbd18e
[tx-robot] updated from transifex 2017-08-02 00:27:56 +00:00
tobiasKaminsky
58832b176d
fix: Wrong argument count, format string media_event_done requires 1 but format call supplies 0 2017-08-01 14:03:16 +02:00
tobiasKaminsky
bd897d856c
enabling dom storage api 2017-08-01 12:06:52 +02:00
tobiasKaminsky
da5f6ef7e1
Merge remote-tracking branch 'remotes/origin/master' into reduceErrors 2017-08-01 11:58:23 +02:00
Nextcloud bot
12cd1ba651
[tx-robot] updated from transifex 2017-08-01 09:56:50 +00:00
tobiasKaminsky
e5bbb7101c
Merge remote-tracking branch 'remotes/origin/master' into reduceErrors 2017-08-01 11:31:54 +02:00
tobiasKaminsky
c7d605c9d7
remove path 2017-08-01 11:11:01 +02:00
tobiasKaminsky
fba917684c
Conflict_message does not show file name/remote path so removing 2017-08-01 11:08:42 +02:00
tobiasKaminsky
0dcf16c362
String "Do you not have a server yet?\nClick here to get one from a provider" does not contain name 2017-08-01 10:49:28 +02:00
tobiasKaminsky
6763093efd
fix: AppCompatActivity.invalidateOptionsMenu can only be called from within the same library group (groupId=com.android.support) 2017-08-01 10:37:59 +02:00
tobiasKaminsky
28e7caedda
fix: Call requires API level 23 (current min is 14): isFingerprintReady 2017-08-01 10:30:23 +02:00
tobiasKaminsky
d8cf4f8464
fix: The WIFI_SERVICE must be looked up on the Application context or memory will leak on devices < Android N. Try changing to .getApplicationContext() 2017-08-01 10:08:32 +02:00
Andy Scherzinger
3f87ea011d Merge pull request #1206 from nextcloud/newWebLoginUntrustedCert
On receiving untrusted ssl cert, test if it was previously accepted user
2017-08-01 08:19:18 +01:00
Nextcloud bot
058b7bad6f
[tx-robot] updated from transifex 2017-08-01 00:27:42 +00:00
Nextcloud bot
a4db5bc8de
[tx-robot] updated from transifex 2017-07-31 00:26:22 +00:00
Jonas Sandrock
1edb1d4135 New android sharing view #1229 2017-07-30 20:11:15 +02:00
Nextcloud bot
9f8e1a0bac
[tx-robot] updated from transifex 2017-07-30 00:27:41 +00:00
Nextcloud bot
8e43cee7f8
[tx-robot] updated from transifex 2017-07-29 00:28:26 +00:00
Allan Nordhøy
f70c7fc5a7 Lowercase "groups" 2017-07-28 18:05:45 +02:00
tobiasKaminsky
732a65ca09
show empty message when receiving external files 2017-07-28 14:49:22 +02:00
tobiasKaminsky
237c3f48cb
show empty message again 2017-07-28 14:48:46 +02:00
tobiasKaminsky
73a3c1578b
use logger 2017-07-28 14:45:39 +02:00
tobiasKaminsky
52c6ac11fa
on receiving untrusted ssl cert, test if it was previous accepted by user, otherwise cancel 2017-07-28 14:45:39 +02:00
tobiasKaminsky
7986682da6
images can be deleted thus no filepath, but are still in media store.
Failed images are substracted from the "real" count.
2017-07-28 14:25:31 +02:00
tobiasKaminsky
26ab00d989
+ is now also white 2017-07-28 14:25:31 +02:00
tobiasKaminsky
b0b66c6f8e
extract html code and make it non-translatable 2017-07-28 09:26:02 +02:00
AndyScherzinger
ee00626a4c
resolves: #1207 make daily contact backup string translatable 2017-07-28 09:13:48 +02:00
AndyScherzinger
b86df12f14
lint: removed obsolete layout params 2017-07-27 15:21:43 +02:00
AndyScherzinger
cb57677f62
remove unused namespace declarations 2017-07-27 15:21:43 +02:00
AndyScherzinger
4342e39142
put variables to the top of the class 2017-07-27 15:21:42 +02:00
AndyScherzinger
685a58cea0
fix codacy warning 2017-07-27 15:21:42 +02:00
AndyScherzinger
ce0580bcca
code review 2017-07-27 15:21:42 +02:00
AndyScherzinger
9c87f407e4
remove unused icon work 2017-07-27 15:21:41 +02:00
AndyScherzinger
c66a919718
remove unused icon work 2017-07-27 15:21:41 +02:00
AndyScherzinger
3a8c9701dd
theme loading progress bar 2017-07-27 15:21:41 +02:00
AndyScherzinger
6c3af67bad
replace deprecated android:singleLine with android:maxLines=1 2017-07-27 15:21:40 +02:00
AndyScherzinger
a2560a867a
raising padding on headline 2017-07-27 15:21:40 +02:00
AndyScherzinger
2c076222b0
theming for zip icon 2017-07-27 15:21:39 +02:00
AndyScherzinger
a327068a81
theme new details screen 2017-07-27 15:21:39 +02:00
AndyScherzinger
016cb21575
theming fixes for ProgressBar elements 2017-07-27 15:21:39 +02:00
AndyScherzinger
b121f8a678
re-use existing view for better performance 2017-07-27 15:21:38 +02:00
AndyScherzinger
06022e78f5
use proper mini headline styling using material body2 definition 2017-07-27 15:21:38 +02:00
AndyScherzinger
dc2cdcf816
avoid re-assigning of var 2017-07-27 15:21:37 +02:00
AndyScherzinger
9b1c1e24c0
codacy 2017-07-27 15:21:37 +02:00
AndyScherzinger
dd503ad8f3
Fix headline coloring 2017-07-27 15:21:37 +02:00
AndyScherzinger
b9751bab35
fixed cherry picked new details 2017-07-27 15:21:36 +02:00
AndyScherzinger
ca7796253c
adapt to cherry pick 2017-07-27 15:21:36 +02:00
masensio
688631bbd2
Review some text sizes in details view 2017-07-27 15:21:36 +02:00
masensio
3ddc2046d9
Review some margins in details view. Add method to show more than one item in share users list view (details view) 2017-07-27 15:21:35 +02:00
masensio
d2c7a6d535
Fix favourite feature from details view 2017-07-27 15:21:35 +02:00
masensio
b2a1d9962f
Add share users to details view 2017-07-27 15:21:34 +02:00
masensio
e2cafad719
Remove old file_details_fragment.xml
# Conflicts:
#	res/layout/file_details_fragment.xml
2017-07-27 15:21:34 +02:00
masensio
4f904b34cd
Add share data to details view layout
# Conflicts:
#	owncloud-android-library
#	res/layout/file_details_fragment_new.xml
#	res/values/strings.xml
#	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2017-07-27 15:21:34 +02:00
AndyScherzinger
6a6e8cd816
remove unused styles 2017-07-27 15:16:33 +02:00
AndyScherzinger
f296628642
remove unused resources 2017-07-27 15:16:33 +02:00
AndyScherzinger
727375642d
allow used added CAs 2017-07-27 15:16:30 +02:00
Mario Đanić
a825555705 Merge pull request #1220 from jsrck/983_hide-folders
On device: show only folders containing downloaded files #983
2017-07-27 08:28:52 +02:00
Mario Đanić
c68d14fdb5 Merge pull request #1230 from nextcloud/moveTest
move tests to /src/test
2017-07-27 08:26:27 +02:00
Nextcloud bot
20e78b4ba9
[tx-robot] updated from transifex 2017-07-26 00:27:43 +00:00
Jonas Sandrock
ae2373e259 Picture "details "page reappear when it shouldn't. #1221 2017-07-25 20:06:20 +02:00
tobiasKaminsky
9291a71750
move tests to /src/test 2017-07-25 10:53:26 +02:00
Nextcloud bot
14fc239dc5
[tx-robot] updated from transifex 2017-07-25 00:27:34 +00:00
Tobias Kaminsky
a3fc2aec19 Merge pull request #1205 from vnidens/sharing_password_visibility
[Share] Enter password: toggle visibility of password #1171
2017-07-24 09:39:54 +02:00
Nextcloud bot
affe12961d
[tx-robot] updated from transifex 2017-07-24 00:27:30 +00:00
Jonas Sandrock
58c588e934 On device: show only folders containing downloaded files #983 2017-07-23 21:14:34 +02:00
Victor Nidens
947fad3299
Reverted edit password view visibility 2017-07-23 19:16:34 +02:00
Victor Nidens
1d0675138e
Indentation fixed 2017-07-23 19:16:34 +02:00
Victor Nidens
c9b185f843
Changed visibility icon tint to look good on colored background 2017-07-23 19:16:34 +02:00
Victor Nidens
fbfd8f22f7
Updated password visibility indicator according to Material guidelines 2017-07-23 19:16:33 +02:00
Victor Nidens
a8bc5c3c79
[Share] Enter password: toggle visibility of password #1171 2017-07-23 19:16:30 +02:00
Jonas Sandrock
f5dcce1b8c
added line break, pull request #1196 2017-07-23 16:15:26 +02:00
Jonas Sandrock
6d25c26a8a
Feature request: Select all (particularly in search) #637 2017-07-23 16:15:23 +02:00
AndyScherzinger
6c15eaa123
remove unused color definitions/layout to make lint happy again 2017-07-23 15:33:59 +02:00
Jonas Sandrock
614546a653
Enhance recommend to a friend #315 2017-07-23 14:56:39 +02:00
Nextcloud bot
eb6a3b1108
[tx-robot] updated from transifex 2017-07-23 00:26:19 +00:00
Nextcloud bot
df1647f140
[tx-robot] updated from transifex 2017-07-22 00:26:48 +00:00
Nextcloud bot
47983d774c
[tx-robot] updated from transifex 2017-07-21 00:26:44 +00:00
Andy Scherzinger
c83a4f6511 Merge pull request #1210 from nextcloud/comradekingu-patch-1
Spelling: Error, GitHub
2017-07-20 11:34:34 +02:00
Nextcloud bot
15cff7b33d
[tx-robot] updated from transifex 2017-07-20 00:27:40 +00:00
Allan Nordhøy
fce5d90b95 Error, GitHub 2017-07-19 18:55:55 +02:00
Nextcloud bot
be778db165
[tx-robot] updated from transifex 2017-07-19 00:27:18 +00:00
tobiasKaminsky
f1c92c2e6d
problem with BOM and not maintained, thus removing 2017-07-18 11:46:23 +02:00
Nextcloud bot
aa4e184495
[tx-robot] updated from transifex 2017-07-18 00:26:47 +00:00
AndyScherzinger
e1d11aa860
fix hardcoded strings 2017-07-17 23:37:36 +02:00
AndyScherzinger
aae046205e
remove unsupported translation (covered by de) 2017-07-17 23:25:07 +02:00
tobiasKaminsky
e642f289c6
change state when dismissing dialog 2017-07-17 10:16:01 +02:00
tobiasKaminsky
b3abe3fcb5
fix dismissing dialog on rotation 2017-07-17 10:15:52 +02:00
Nextcloud bot
94e1941bf1
[tx-robot] updated from transifex 2017-07-17 00:26:34 +00:00
tobiaskaminsky
87ae252a09
- strike out the account name (aka, you can't click it)
- switch to other acc if it exists, if not show login screen
- run a job with all the delete magic
- prevent adding the same account while there is pending delete for that account
2017-07-16 18:09:17 +02:00
tobiasKaminsky
8fef61ea93
delete all local files on account removal 2017-07-16 18:06:28 +02:00
tobiasKaminsky
3a9eba43e9
fix removing of local only folder 2017-07-16 17:09:12 +02:00
Andy Scherzinger
ab27bc3e2a Merge pull request #1173 from nextcloud/ErrorInActivityListAdapter
Catch a rare exception while setting activity list adapter
2017-07-16 17:07:09 +02:00
AndyScherzinger
3a94905651
codacy: remove unnecessary use of fully qualified name 'android.os.Build.MODEL' due to existing import 'android.os.Build' 2017-07-16 16:44:46 +02:00
AndyScherzinger
6c92d44ef6
lint: remove unused resources 2017-07-16 16:42:57 +02:00
tobiasKaminsky
06cc85bb69
progressbar until loginsite is loaded 2017-07-16 16:42:56 +02:00
tobiasKaminsky
3403d55568
show correct warning if an account is added twice 2017-07-16 16:42:56 +02:00
tobiasKaminsky
d82077e16e
rotating 2017-07-16 16:42:56 +02:00
tobiasKaminsky
510a433116
login into the same server is now possible 2017-07-16 16:42:55 +02:00
tobiasKaminsky
76fd2da696
early access to login 2017-07-16 16:42:55 +02:00
tobiasKaminsky
8fd610a773
initial hide user/pass, show only if <nc12 2017-07-16 16:42:55 +02:00
tobiaskaminsky
4d9b518b4e
initial start for using new weblogin flow 2017-07-16 16:42:51 +02:00
tobiaskaminsky
d16d395a78
fix no showing shares after "shared" view 2017-07-16 16:23:38 +02:00
tobiasKaminsky
ebf0a40195
remove version dependency as NC can this in all supported version 2017-07-16 15:54:29 +02:00
tobiasKaminsky
d80ac412c0
use grey theme if no theming of elements is possible 2017-07-16 15:54:29 +02:00
tobiasKaminsky
6832fd4505
renamed tag 2017-07-16 15:47:19 +02:00
tobiasKaminsky
6eaa99ed90
catch a rare exception while setting activity list adapter 2017-07-16 15:47:19 +02:00
Nextcloud bot
aefdbb29f9
[tx-robot] updated from transifex 2017-07-15 00:28:07 +00:00
AndyScherzinger
cbeb7ea621
fix share icon display 2017-07-14 15:06:00 +02:00
tobiasKaminsky
85b6a50eae
click on shared/linked icon opens share dialog 2017-07-14 12:53:38 +02:00
Nextcloud bot
cf897d6db2
[tx-robot] updated from transifex 2017-07-14 10:04:56 +00:00
tobiaskaminsky
05b4c4b9f5
fix missing / 2017-07-14 11:16:58 +02:00
Nextcloud bot
3f59ac9554
[tx-robot] updated from transifex 2017-07-14 00:28:24 +00:00
AndyScherzinger
9ab5338099
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-13 09:24:46 +02:00
Nextcloud bot
1e667a260a
[tx-robot] updated from transifex 2017-07-13 00:28:00 +00:00
Nextcloud bot
a365552596
[tx-robot] updated from transifex 2017-07-12 00:27:58 +00:00
tobiasKaminsky
05985f3186
api check 2017-07-11 12:45:19 +02:00
tobiasKaminsky
938e222e8f
themeable switch preference 2017-07-11 12:25:55 +02:00
tobiasKaminsky
3fbe9b89b8
proper licence 2017-07-11 11:59:02 +02:00
tobiasKaminsky
0bd03548f3
use darker fallback color 2017-07-11 11:49:27 +02:00
AndyScherzinger
1b64ac7abe
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-11 09:26:34 +02:00
AndyScherzinger
76779f9b2e
fix legacy sdk checks for pre-v14 sdks 2017-07-11 09:25:24 +02:00
tobiasKaminsky
2fd5e75975
remove unnecessary line wraps 2017-07-11 07:49:57 +02:00
tobiasKaminsky
466772ffbe
use fallback theme to color bullet points of upload behaviour 2017-07-11 07:49:11 +02:00
Nextcloud bot
36fa8691e4
[tx-robot] updated from transifex 2017-07-11 00:28:59 +00:00
AndyScherzinger
4dfad4b88f
use appcompat classes as parent 2017-07-10 16:44:43 +02:00
AndyScherzinger
bf35562785
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-10 14:37:45 +02:00
tobiasKaminsky
a98229d6fa
user server name instead of slogan 2017-07-10 14:17:42 +02:00
tobiasKaminsky
09435b49c9
remove wrong java doc 2017-07-10 13:56:24 +02:00
tobiasKaminsky
ac1984bf42
npe if toolbar null 2017-07-10 13:55:53 +02:00
Nextcloud bot
c493da52de
[tx-robot] updated from transifex 2017-07-10 00:27:56 +00:00
Allan Nordhøy
d4de0af079 Spelling and language fixes
As per https://oauth.net/2/
Tab removed from:

"Your search returned no files modified
+    <string name="file_list_empty_recently_modified_filter">Search returned no files modified the last 7 days.</string>
-        in the last 7 days."

/AutoUpload is now consistent with /InstantUpload
2017-07-09 19:55:36 +02:00
Nextcloud bot
684dde1795
[tx-robot] updated from transifex 2017-07-08 00:27:28 +00:00
tobiasKaminsky
24c198fb32
If file is shared to NC now the correct color is set for the chosen account 2017-07-06 10:06:18 +02:00
Nextcloud bot
0d8b5090af
[tx-robot] updated from transifex 2017-07-06 00:27:38 +00:00
Nextcloud bot
a361088838
[tx-robot] updated from transifex 2017-07-05 00:27:15 +00:00
tobiaskaminsky
434e5315be
Drawer: use primary dark color for active item 2017-07-04 13:02:04 +02:00
tobiaskaminsky
26a1257857
theme folder in receiveFilesActivity 2017-07-04 10:53:43 +02:00
tobiaskaminsky
17fcbc6e89
checkbox in upload files activity 2017-07-04 10:40:23 +02:00
tobiaskaminsky
2ff2eefb9c
checkbox in details screen for set available offline is now themed 2017-07-04 10:19:28 +02:00
tobiaskaminsky
6c3ffc8901
actionbar is always grey 2017-07-04 10:15:28 +02:00
tobiaskaminsky
ebe483b3ef
- fix wrong ref
- theme "choose date" button
2017-07-04 10:11:57 +02:00
tobiaskaminsky
b85d7947b1
Merge remote-tracking branch 'remotes/origin/master' into userTheming 2017-07-04 10:03:12 +02:00
Nextcloud bot
cd9b12a99c
[tx-robot] updated from transifex 2017-07-04 00:26:48 +00:00
Nextcloud bot
3603ca1d40
[tx-robot] updated from transifex 2017-07-03 00:27:00 +00:00
Nextcloud bot
5d735a84ca
[tx-robot] updated from transifex 2017-07-02 00:26:31 +00:00
tobiaskaminsky
ac42e07c48
fix list view by removing wrong breaks 2017-07-01 08:27:58 +02:00
Nextcloud bot
8422555e6f
[tx-robot] updated from transifex 2017-07-01 00:27:19 +00:00
AndyScherzinger
c88d9205a2
Merge branch 'master' of https://github.com/nextcloud/android into userTheming
# Conflicts:
#	scripts/lint/lint-results.txt
#	src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java
#	src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
#	src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
2017-06-30 22:43:37 +02:00
Andy Scherzinger
72e8888bd2 Merge pull request #1140 from nextcloud/autoUploadWithoutStoragePermission
Prevent NPE when disabling "storage permission" and then access auto upload
2017-06-30 22:25:27 +02:00
Andy Scherzinger
0c5f99a935 Merge pull request #1153 from nextcloud/activityListWrongClicks
Clicking on link in activity list shows correct file/folder
2017-06-30 22:22:05 +02:00
Mario Đanić
63efe2de4e Merge pull request #1101 from nextcloud/codacy
codacy fixes: add break to switch statements
2017-06-30 20:45:31 +02:00
Mario Đanić
2fe0a9bb9c Merge pull request #1102 from nextcloud/transactionTooLarge
Transaction too large
2017-06-30 20:45:18 +02:00
Mario Đanić
c2a9fcff27 Merge pull request #1133 from nextcloud/settingsOn4x
Fix settings on android 4.x
2017-06-30 20:43:13 +02:00
Mario Đanić
0bfd037f0a Merge pull request #1149 from nextcloud/stopAsyncTasks
Cancel pending thumbnail tasks
2017-06-30 20:41:39 +02:00
AndyScherzinger
40ad53b126
theme progress wheels notifications/activities 2017-06-30 17:35:59 +02:00
AndyScherzinger
efd009ce2c
theme links in activities 2017-06-30 17:25:30 +02:00
AndyScherzinger
8cafe7c5a3
fix primary button theming for external file reveiving 2017-06-30 17:14:48 +02:00
AndyScherzinger
4e0d2ffd71
fix imports 2017-06-30 17:06:18 +02:00
AndyScherzinger
0d34046375
Fix NPE 2017-06-30 16:59:49 +02:00
AndyScherzinger
ca260d5d70
theming for primary button log history 2017-06-30 16:53:12 +02:00
AndyScherzinger
04ec5bf7d7
Merge branch 'userTheming' of https://github.com/nextcloud/android into userTheming 2017-06-30 16:46:01 +02:00
AndyScherzinger
28a19bb004
move theming to ThemeUtils 2017-06-30 16:45:24 +02:00
Tobias Kaminsky
9e68200880 Merge b3c9b504c3 into ad3bf3c256 2017-06-30 13:58:58 +00:00
AndyScherzinger
b3c9b504c3
SDK is always >= 14 2017-06-30 15:58:47 +02:00
AndyScherzinger
018c136e4b
remove unused code for codacy scan 2017-06-30 15:36:14 +02:00
tobiaskaminsky
158f069435
color missing header divider 2017-06-30 14:19:44 +02:00
tobiaskaminsky
b41bd77daa
accent color: if dark theme then light color, else darker color than primary 2017-06-30 14:03:15 +02:00
tobiaskaminsky
4dafe39bba
color action bar 2017-06-30 14:02:43 +02:00
tobiasKaminsky
ce9d48d08d
remove obsolete strings 2017-06-30 13:11:00 +02:00
tobiasKaminsky
4d123d0b73
fix npe if folder on server does not exist 2017-06-30 13:10:59 +02:00
tobiasKaminsky
a5f83d9d02
change ui for public release 2017-06-30 13:10:59 +02:00
tobiasKaminsky
e049b56c66
show "contacts backup" eithen in drawer or settings 2017-06-30 13:10:58 +02:00
AndyScherzinger
4dd37f2863
codacy: add break to switch statements 2017-06-30 13:05:06 +02:00
tobiaskaminsky
ee42373837
load file infos only when clicking on activity item 2017-06-30 13:02:02 +02:00
tobiasKaminsky
af094a570f
clicking on link in activity list shows correct file/folder 2017-06-30 13:01:58 +02:00
Nextcloud bot
baf33b6b17
[tx-robot] updated from transifex 2017-06-30 00:27:29 +00:00
Nextcloud bot
b2f99131f2
[tx-robot] updated from transifex 2017-06-29 00:27:06 +00:00
tobiaskaminsky
2cc1487f27
adapt import for codacy 2017-06-28 14:57:57 +02:00
tobiaskaminsky
3ac7496452
- set priority of image processing to higher value
- cancel all pending async tasks when leaving FDA: needs to be done by get.abort() as this is a blocking command and needs to be accessed directly
2017-06-28 13:00:09 +02:00
Tobias Kaminsky
5e0f6601e0 Merge 0d198a5f97 into f9ec3574c1 2017-06-27 07:27:23 +00:00
tobiasKaminsky
0d198a5f97
new permission system only on > Jelly Bean 2017-06-27 09:26:39 +02:00
Nextcloud bot
f9ec3574c1
[tx-robot] updated from transifex 2017-06-27 00:27:28 +00:00
tobiasKaminsky
a4c0693288
prevent NPE when disabling "storage permission" and then access auto upload 2017-06-26 16:15:27 +02:00
tobiasKaminsky
7e58cb1f27
fix settings on android 4.x 2017-06-26 08:03:52 +02:00