mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 16:24:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
6485 commits 220 branches 1588 tags 639 MiB
Commit graph

3429 commits

Author SHA1 Message Date
tobiasKaminsky
923d4b6293 wip 2016-09-06 10:36:07 +02:00
tobiasKaminsky
5890f554cd wip 2016-09-06 10:36:07 +02:00
tobiasKaminsky
1ace509e4f wip 2016-09-06 10:36:07 +02:00
Andy Scherzinger
92d28b8e83 mix folders and files on sort by date for local folders too 2016-09-04 19:32:14 +02:00
tobiasKaminsky
304ab15b51 mix folders and files on sort by date 2016-09-04 19:17:42 +02:00
Andy Scherzinger
32be5dfeb3 Merge pull request #171 from nextcloud/uploadWhenCharging 
Upload when charging
 2016-09-04 19:12:44 +02:00
Tobias Kaminsky
99d9d0ac13 Merge pull request #197 from nextcloud/fixPublicLink 
search for the right ocShare with public link
 2016-09-03 20:56:56 +02:00
Tobias Kaminsky
51f05ba65d Merge pull request #229 from nextcloud/fixEmptyLocalUploadFolder 
bugfix for empty folder display
 2016-09-03 20:56:26 +02:00
tobiasKaminsky
271704c895 Merge remote-tracking branch 'origin/fixPublicLink' into fixPublicLink 2016-09-03 20:29:05 +02:00
tobiasKaminsky
77f9902f17 Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-09-03 20:10:51 +02:00
tobiasKaminsky
74452c0dd7 search for the right ocShare with public link 2016-09-01 16:10:25 +02:00
Andy Scherzinger
70e8f62581 Added 'Pending' placeholder for still-unknown size of incoming federated folders 2016-09-01 14:42:55 +02:00
Andy Scherzinger
ad673921eb fix remote folder size display (seems to have been lost after 1.2.0) 2016-09-01 14:24:03 +02:00
Andy Scherzinger
2fafdcf9ca bugfix showing empty local folders as empty and not showing the parent folder in an empty folder 2016-09-01 11:28:30 +02:00
Andy Scherzinger
4f32abfafe sizeScale 1 for MB, code removed for unsupported legacy Android versions 2016-09-01 10:12:02 +02:00
Andy Scherzinger
b29744c004 show quota for server without quota-unlimited info capability 2016-08-31 19:05:50 +02:00
Andy Scherzinger
0f80bdc894 CR changes 2016-08-18 15:55:11 +02:00
Andy Scherzinger
5280d66139 colorize quota progress bar depending on thresholds met, reformattings 2016-08-18 15:55:11 +02:00
Andy Scherzinger
2c941a5749 minor code refactoring extracting setup code into dedicated methods 2016-08-18 15:55:11 +02:00
Andy Scherzinger
217658740f get and show quota information 2016-08-18 15:55:11 +02:00
Andy Scherzinger
3658becdf5 view elements fix 2016-08-18 15:55:11 +02:00
Andy Scherzinger
f8e0ee9ce1 initial quota display implementation 2016-08-18 15:55:11 +02:00
Andy Scherzinger
3f364ff783 reformetted two lines 2016-08-16 11:58:42 +02:00
tobiasKaminsky
351d7ba7c1 changes due to CR 2016-08-16 11:58:42 +02:00
tobiasKaminsky
3c715fe489 finish 2016-08-16 11:58:42 +02:00
tobiasKaminsky
993264c8b1 wip 2016-08-16 11:58:42 +02:00
Tobias Kaminsky
45c98398ac Merge pull request #166 from nextcloud/refresh_folders_startup 
Refresh when app starts
 2016-08-16 08:43:15 +02:00
Andy Scherzinger
15a2439769 fix NPE (and unnecessary auto-boxing) 2016-08-15 14:21:54 +02:00
Andy Scherzinger
47e12fb278 CR changes 2016-08-14 21:50:46 +02:00
Andy Scherzinger
25a7a20352 Changed the delay to execute the runnable in startSyncFolderOperation, adding 350 ms. 2016-08-14 21:25:41 +02:00
Andy Scherzinger
37295ffecb update to Nc Android lib 1.0.2 2016-08-09 00:06:51 +02:00
tobiasKaminsky
f890b3553a resume chunked uploads 2016-08-09 00:06:51 +02:00
Andy Scherzinger
22ac5d3ff2 Merge pull request #199 from nextcloud/fixUploadComparator 
Fix comparator determining order of list of uploads
 2016-08-08 23:25:12 +02:00
tobiasKaminsky
f6e4a6b609 generate thumbnails only if mCurrentUpload is not null 2016-08-08 19:33:23 +02:00
tobiasKaminsky
aa069d3623 Merge remote-tracking branch 'origin/fixPublicLink' into fixPublicLink 2016-08-08 19:21:52 +02:00
tobiasKaminsky
9376da816d constant, prevent possible NPE 2016-08-08 19:20:45 +02:00
David A. Velasco
80c69a439f Fix comparator determining order of list of uploads 2016-08-08 13:13:08 +02:00
tobiasKaminsky
1f9be869c2 search for the right ocShare with public link 2016-08-08 12:57:55 +02:00
tobiasKaminsky
3cb205a548 search for the right ocShare with public link 2016-08-08 10:06:09 +02:00
Andy Scherzinger
fdc7fdcbf9 proper show hide during drawer open/close, also for filter-menu-item 2016-08-03 19:20:44 +02:00
Andy Scherzinger
3399f99ed9 GPLv3 2016-08-03 19:20:44 +02:00
Andy Scherzinger
69415612ec fixed license version 2016-08-03 19:20:44 +02:00
tobiasKaminsky
a3a6420ead filter for oc file list and local file list 2016-08-03 19:20:44 +02:00
Tobias Kaminsky
d828395d3a Merge pull request #180 from nextcloud/NPEonEmptyLocalFolder 
prevents NPE when selecting empty local folder
 2016-08-03 18:01:19 +02:00
Tobias Kaminsky
67001d4a13 Merge pull request #161 from nextcloud/meteredWiFi 
delay instant upload when metered wifi is used
 2016-08-03 18:00:52 +02:00
David A. Velasco
a62cbd0cd8 Username trimmed in log-in view 2016-08-02 19:50:54 +02:00
David A. Velasco
9905e5c393 Add flag to disable suggestions in password field, no matter if visible or not 2016-08-02 19:50:54 +02:00
tobiasKaminsky
c5159e9246 delay instant upload when metered wifi is used 2016-08-02 16:01:28 +02:00
tobiasKaminsky
99852c1bc8 djvu is not an image 2016-08-01 14:49:56 +02:00
tobiasKaminsky
d533b5f2d9 prevents NPE when selecting empty local folder 2016-07-31 12:33:35 +02:00
tobiasKaminsky
ac695b7444 fix sharing for beta 2016-07-30 18:38:21 +02:00
tobiasKaminsky
9587af3e9d Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-07-30 16:56:44 +02:00
Andy Scherzinger
58f86500ad generalization in super class 2016-07-22 18:50:22 +02:00
Andy Scherzinger
20d33737cc javaDoc 2016-07-22 17:52:28 +02:00
Andy Scherzinger
16b1a95cc5 #145 Let user go back from upload activity 2016-07-22 17:40:19 +02:00
Andy Scherzinger
8487793056 fix compile error after merge 2016-07-21 13:13:55 +02:00
jabarros
1a1d50f8b6 Fix crash when adding a saml account 2016-07-21 13:13:54 +02:00
Andy Scherzinger
2e3d3a1aa0 Merge pull request #137 from nextcloud/userDebugPhone 
Log.wtf() should not be used unless an assertion fails
 2016-07-21 13:03:11 +02:00
Andy Scherzinger
573f95d110 fixes after merge 2016-07-20 15:33:08 +02:00
Andy Scherzinger
62c918f59a Merge 'master' including conflict fixing 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2016-07-20 15:26:59 +02:00
Andy Scherzinger
1876746481 Merge pull request #36 from nextcloud/video_thumbnail 
Video thumbnail
 2016-07-20 15:20:26 +02:00
Andy Scherzinger
71a44db0dd CR changes 2016-07-20 14:24:03 +02:00
Andy Scherzinger
2af26edb0b Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew 
Conflicts:
	res/values-ca/strings.xml
	res/values-he/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-ko/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
 2016-07-20 13:19:41 +02:00
Andy Scherzinger
ecf1f9e3da proper status bar coloring for multi select mode, cleanup logging 2016-07-20 13:09:56 +02:00
Andy Scherzinger
a6bd6030d2 Replace Log.wtf calls with Log.e 2016-07-19 14:36:41 +02:00
Kenny Root
b7295e5f09 Replace Log.wtf calls with Log.e 
This will prevent crashing when running on a userdebug phone. Log#wtf
should only be used when the program can not go on because a critical
assertion fails. These all don't seem to meet that criteria.

Fixes #1603

Conflicts:
	src/com/owncloud/android/ui/activity/FileActivity.java
 2016-07-19 14:33:01 +02:00
tobiasKaminsky
dfae9cfc27 fix NPE 2016-07-16 08:11:30 +02:00
tobiasKaminsky
ff32763024 update to master 2016-07-15 20:15:59 +02:00
tobiasKaminsky
98a679548a Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew 2016-07-15 18:32:56 +02:00
tobiasKaminsky
411e5392bc Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-15 18:05:05 +02:00
Bartosz Przybylski
3f952fad30 Update account list adapter, just notifying adapter makes no sense 2016-07-14 23:31:46 +02:00
Bartosz Przybylski
098cf7dd46 Add confirmation dialog on account deletion 2016-07-14 23:31:46 +02:00
Andy Scherzinger
9172618c73 rename fix 2016-07-14 22:43:20 +02:00
tobiasKaminsky
cc3dfd6100 using all files not only downloaded one 2016-07-14 22:42:24 +02:00
Andy Scherzinger
a33a03a928 adaption after rebase to switch between all/offline files 2016-07-14 22:42:23 +02:00
tobiasKaminsky
abca14ce17 fixed bug #1297 2016-07-14 22:42:21 +02:00
tobiasKaminsky
7a2338f8d8 refresh after chage 2016-07-14 22:42:18 +02:00
tobiasKaminsky
9d74b7e223 enabled all occurrences. 2016-07-14 22:42:18 +02:00
Andy Scherzinger
21c80b056e added local size sorter 2016-07-14 15:46:02 +02:00
Andy Scherzinger
cfe77ce270 renamed method 2016-07-14 15:40:45 +02:00
Andy Scherzinger
edc7781af9 simplified and bugfixed code using our own preference manager to handle preferences 2016-07-14 15:33:33 +02:00
Andy Scherzinger
2b7c555be8 Fixes after rebase 2016-07-14 14:38:38 +02:00
Andy Scherzinger
9f0008aeb9 rebase fixes 2016-07-14 14:31:47 +02:00
tobiasKaminsky
4c20679538 add sort to UploadFileActiviy 2016-07-14 14:31:46 +02:00
Andy Scherzinger
7fb1c1de3f Merge pull request #43 from nextcloud/thumbnailDuringUpload 
Thumbnail during upload
 2016-07-13 21:49:32 +02:00
Andy Scherzinger
174fa1d7b7 CR changes 2016-07-13 12:58:38 +02:00
Andy Scherzinger
9b6ef94803 add license header 2016-07-13 11:24:16 +02:00
Andy Scherzinger
2c0950bc55 Move MimeType DIR to a constant in a MimeType class 2016-07-13 11:21:49 +02:00
tobiasKaminsky
fadb79aefd minor code optimization 2016-07-13 11:04:44 +02:00
tobiasKaminsky
6c1deae1a2 use size computed by server 2016-07-13 11:04:43 +02:00
tobiasKaminsky
adaf5cf09e thumbnail generation also when "file is kept in original folder" is set 2016-07-12 20:55:08 +02:00
tobiasKaminsky
7108e7ef6d Merge remote-tracking branch 'origin/thumbnailDuringUpload' into thumbnailDuringUpload 2016-07-12 20:14:16 +02:00
David A. Velasco
dc44e8c28c Recovered wait dialog for move and delete operations 
Conflicts:
	src/com/owncloud/android/files/FileOperationsHelper.java
 2016-07-12 19:27:06 +02:00
David A. Velasco
3ed8cd4f1e Removed unused dialog 2016-07-12 19:26:44 +02:00
David A. Velasco
25f623be8f New 'move' icon; fixed hdpi, mdpi icons 2016-07-12 15:31:48 +02:00
David A. Velasco
79b04a5c29 Finish selection mode before showing details view for a file 2016-07-12 15:31:48 +02:00
tobiasKaminsky
5ad7225003 Create thumbnail during instant upload 2016-07-09 21:05:44 +02:00
Andy Scherzinger
bca547621f merge conflict resolved 2016-07-09 20:45:58 +02:00
David A. Velasco
fdeff61ce2 Fixed life cycle of ExtendedListFragment (see #onCreateView method) so that selections are tracked in grid mode during rotations without tracking them in our code 2016-07-09 19:49:38 +02:00
David A. Velasco
0a4ac6e91c Update selection in FileListListAdapter using ID received from list instead of position, so that changes removals or additions in the list result in correct update of the drawn selection 2016-07-09 19:49:37 +02:00
David A. Velasco
db6acc6868 Clean-up and small refactorings 
Conflicts:
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2016-07-09 19:49:37 +02:00
David A. Velasco
936c182c3a Fixed wrong onOptionsItemSelected implementations 2016-07-09 19:47:25 +02:00
tobiasKaminsky
644f255238 show video placeholder correctly 2016-07-02 18:06:00 +02:00
tobiasKaminsky
1edc488995 Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-02 17:49:16 +02:00
tobiasKaminsky
c315b0e753 fix from CR 2016-07-02 13:36:50 +02:00
tobiasKaminsky
d6ecf06f39 check if correct adapter is used 2016-07-01 18:37:17 +02:00
Andy Scherzinger
ab136a14a3 Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew 
Conflicts:
	build.gradle
	oc_jb_workaround/build.gradle
	owncloud-android-library
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	res/menu/file_actions_menu.xml
	res/values/setup.xml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/db/PreferenceManager.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2016-06-30 15:11:34 +02:00
jabarros
460e187713 Fix. Allow set multiple files as 'Available offline' 2016-06-30 13:02:29 +02:00
Marius Blüm
36b24a9673 Merge pull request #75 from nextcloud/loginLayout 
Slight design optimizations for the login screen #22
 2016-06-27 18:52:53 +02:00
Andy Scherzinger
c875bbace1 Merge pull request #35 from nextcloud/feature_uploadsubfolders 
Feature uploadsubfolders
 2016-06-27 10:45:41 +02:00
Andy Scherzinger
718fec0935 remove card view, change edit text and icon coloring 2016-06-26 22:59:28 +02:00
Andy Scherzinger
30ab5a6b57 code review: use string instead of object to not having to do instance of checks 2016-06-25 16:27:30 +02:00
Andy Scherzinger
78f1aa5f66 centralize handlePNG function 2016-06-25 16:27:30 +02:00
Andy Scherzinger
a466cfd109 PNG handling with NPE check first 2016-06-25 16:27:29 +02:00
Andy Scherzinger
5c44ea5884 Always process for png transparency 2016-06-25 16:27:29 +02:00
Andy Scherzinger
d413cfce0a enforce refresh during start 2016-06-25 16:27:28 +02:00
Bartosz Przybylski
54f7e64414 Trying to generalize avatar setting. 2016-06-25 16:27:26 +02:00
Andy Scherzinger
880ac5f412 cleanups due to the code review, removing unused code 2016-06-25 16:27:25 +02:00
Andy Scherzinger
91f3629757 cleanup due to code review 2016-06-25 16:27:24 +02:00
Andy Scherzinger
e043dfbcb4 renamed getter method to be more java style like 2016-06-25 16:27:23 +02:00
Andy Scherzinger
7ff136854b layout fixes after rebase 2016-06-25 16:27:22 +02:00
Andy Scherzinger
220de2fef3 fix for #41 2016-06-25 16:27:21 +02:00
Andy Scherzinger
face3c6efd merge fix after rebase 2016-06-25 16:27:20 +02:00
Andy Scherzinger
9985872bd3 BugFix Log screen Toolbar 2016-06-25 16:27:19 +02:00
Andy Scherzinger
892cfd6f8f avatar loading for account manager too + house keeping 2016-06-25 16:27:17 +02:00
Andy Scherzinger
ee71b38a84 fixing the thumbnail caching (user's name can be the same on two different servers), minor housekeeping for account name parsing 2016-06-25 16:27:17 +02:00
Andy Scherzinger
87359121f8 extend implementation to also set avatars in menu items 2016-06-25 16:27:16 +02:00
Andy Scherzinger
06dc13601e drawer preparations for "On Device" menu item 2016-06-25 16:27:15 +02:00
Andy Scherzinger
cf158abbb6 aligned management screen with material design sizings 2016-06-25 16:27:13 +02:00
Andy Scherzinger
8b002c5d17 resized text, style and alignment within TextDrawable + cleanups 2016-06-25 16:27:13 +02:00
Andy Scherzinger
ff75f71836 move avatar helper method to TextDrawable, define everything in dp to be independent 2016-06-25 16:27:12 +02:00
Andy Scherzinger
3f53587308 deactivating icon tinting for drawer menu icons on pre lollipop versions 2016-06-25 16:27:12 +02:00
Andy Scherzinger
56e84a2c7f Fix for dynamic avatar sizing for generic letter/circle avatars 2016-06-25 16:27:10 +02:00
Andy Scherzinger
583dca5cbc rudimentary drawer header / avatar based account switching. 2016-06-25 16:27:10 +02:00
Andy Scherzinger
c813003e8b JavaDoc 2016-06-25 16:27:09 +02:00
Andy Scherzinger
a0596e0ca1 merged avatar branch + circular avatar in drawer header 2016-06-25 16:27:08 +02:00
tobiasKaminsky
8dbb5b6305 wip 
Conflicts:
	res/layout/drawer.xml
	src/com/owncloud/android/ui/activity/FileActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2016-06-25 16:27:08 +02:00
Andy Scherzinger
dc8e596546 for null checks 2016-06-25 16:27:07 +02:00
Andy Scherzinger
acf8db8c3f NPE Fix 2016-06-25 16:27:06 +02:00
Andy Scherzinger
acf77ddc04 standard header layouting, flexible avatar radius, code cleanups, dynamic avatar sizing 2016-06-25 16:27:06 +02:00
Andy Scherzinger
534d58008e checked menu item state implementation 2016-06-25 16:27:05 +02:00
Andy Scherzinger
bf3deb49a2 rebase fixes 2016-06-25 16:27:04 +02:00
Andy Scherzinger
7c111125d3 cleanup after drawer-rewrite 2016-06-25 16:27:02 +02:00
Andy Scherzinger
27a9abc8b5 Streamlining moving account handling to a base class b/c it does not belong to toolbar or drawer implementation 2016-06-25 16:27:01 +02:00
Andy Scherzinger
3fef018452 moved account handling to base activity since this is not file specific and thus should be available on (new) base level 2016-06-25 16:27:01 +02:00
Andy Scherzinger
d15d912a67 Streamlining moving account handling to a base class b/c it does not belong to toolbar or drawer implementation 2016-06-25 16:27:00 +02:00
tobiasKaminsky
81de65d1a2 fix: crash when opening upload dialog 2016-06-25 16:27:00 +02:00
Andy Scherzinger
e789178587 added single top flag 2016-06-25 16:26:58 +02:00
Andy Scherzinger
9c2fe3f4fd change detection for the drawer implementation 2016-06-25 16:26:58 +02:00
Andy Scherzinger
f7178fa837 housekeeping Preferences, removed all accounts related code 2016-06-25 16:26:57 +02:00
Andy Scherzinger
9925b8ea40 missing license comment in class 2016-06-25 16:26:56 +02:00
Andy Scherzinger
5f0f04a324 if new account is created via drawer menu item click, refresh drawer account list and active account 2016-06-25 16:26:55 +02:00
Andy Scherzinger
7d4092e3ca proper list rendering upon account add/remove 2016-06-25 16:26:55 +02:00
Andy Scherzinger
d6fd180aa8 next try 2016-06-25 16:26:54 +02:00
Andy Scherzinger
03da5afcda minor changes for testing 2016-06-25 16:26:53 +02:00
Andy Scherzinger
7d30667b50 trying to detect account additions and change the list view content (not working yet) 2016-06-25 16:26:53 +02:00
Andy Scherzinger
37da1a7920 wip account management - account list changes aren't propagated back to the drawer yet, preferences haven't been cleaned up yet 2016-06-25 16:26:52 +02:00
Andy Scherzinger
5f1c6ee134 split toolbar content method 2016-06-25 16:26:51 +02:00
Andy Scherzinger
7f72e8cabd housekeeping removing old account switching code 2016-06-25 16:26:51 +02:00
Andy Scherzinger
0f8f714645 preserve drawer state on screen rotation and resumes, move color calculation code to utils class 2016-06-25 16:26:50 +02:00
Andy Scherzinger
f32493c6f1 account switching implemented (mostly by moving account related methods from FileActivity.javato DrawerActivity.java) 2016-06-25 16:26:49 +02:00
Andy Scherzinger
7e2c560004 circle icons for accounts with color coding 2016-06-25 16:26:49 +02:00
Andy Scherzinger
d9d3424968 initial account handling in drawer + initial icon generation (still broken) 2016-06-25 16:26:48 +02:00
Andy Scherzinger
f41e567b90 general menu/account list switch implemented (open: populate account list) 2016-06-25 16:26:47 +02:00
Andy Scherzinger
f82c4d96ba initial account chooser toggle and further abstraction of the drawer API for child classes 2016-06-25 16:26:47 +02:00
Andy Scherzinger
ce803aa4e0 initial (functionless) account switcher for the drawer header and display size depending header sizing 2016-06-25 16:26:46 +02:00
Andy Scherzinger
29d8288bd5 initial bug fix for the uploader 2016-06-25 16:26:46 +02:00
Andy Scherzinger
8cb4e8f2bf navigation bug fix for previewing text files 2016-06-25 16:26:45 +02:00
Andy Scherzinger
ed33c0aff4 initial rewrite to make use of the toolbar 2016-06-25 16:26:44 +02:00
tobiasKaminsky
08a11dd660 Merge remote-tracking branch 'remotes/origin/master' into newMultiSelect 2016-06-25 10:30:05 +02:00
David Wiesner
4f7d3d4fd1 fix: GridView not restore selected positions but getCheckedItemCount ill return right value 2016-06-24 12:11:31 +02:00
David Wiesner
ad6a82e925 reset: autoformat imports 2016-06-24 12:11:31 +02:00
David Wiesner
c95245acf0 remove duplicate 2016-06-24 12:11:31 +02:00
David Wiesner
b142de752c reset: imports format 2016-06-24 12:11:31 +02:00
David Wiesner
3bf36dd5f0 remove duplicates 2016-06-24 12:11:31 +02:00
David Wiesner
659f280a8b build fixes 2016-06-24 12:11:31 +02:00
David Wiesner
dbccf34e8b rebase 2016-06-24 12:11:31 +02:00
David Wiesner
8aac596d72 remove unnecessary tests 2016-06-24 12:11:31 +02:00
David Wiesner
fda8708ce1 multi-select-fix-rotate-899 2016-06-24 12:11:31 +02:00
David Wiesner
a3fae49fbf multi-select-fix-rotate-899 2016-06-24 12:11:31 +02:00
David A. Velasco
7631bc24d3 Patch preventing crash during move of multiple files 2016-06-24 12:11:31 +02:00
David A. Velasco
301ec578bc Fix crash due to obsolete string resources 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
c6219c610f Update actions menu on creation, to avoid losing filtering state 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
00cd3e6199 Actions menu filtering based on all checked items 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
5adf2fc54c Remove manually destruction of the multiselect menu 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
9af6bf238c Remove deprecated code after last update 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
217a5e9825 Update menu filter on item checked state changed 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
03045c502d Add MultiChoiceModeListener for both listView and gridView 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
ba5eb293df Assignment not anonymous, and put back the Override annotations 2016-06-24 12:11:31 +02:00
Andy Scherzinger
424854875f show/hide logic for FAB during multi selection mode switching 2016-06-24 12:11:31 +02:00
Andy Scherzinger
98d4e4220e use actual checkbox icon work 2016-06-24 12:11:31 +02:00
tobiasKaminsky
3f108e7a52 changes according to CR 2016-06-24 12:11:31 +02:00
Andy Scherzinger
4380290d90 code review fixes 2016-06-24 12:11:31 +02:00
Andy Scherzinger
2e65ffcf4f grey system bar coloring on multi select 2016-06-24 12:11:31 +02:00
tobiasKaminsky
ad8c22cf20 fix for #1350 2016-06-24 12:11:31 +02:00
tobiasKaminsky
f7b73bff89 fix #1259 2016-06-24 12:11:31 +02:00
tobiasKaminsky
f1cba47d40 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d142cca6ab wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
5085a92760 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
4d87dbfaf3 changed highlighted color 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d761f24572 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
ee01a1ad1d add missing files 2016-06-23 21:23:52 +02:00
tobiasKaminsky
1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud 
# Conflicts:
#	res/drawable-hdpi/ic_checkbox_marked.png
#	res/drawable-mdpi/ic_checkbox_marked.png
#	res/drawable-xhdpi/ic_checkbox_marked.png
#	res/drawable-xxhdpi/ic_checkbox_marked.png
#	res/layout/grid_image.xml
#	res/values/strings.xml
#	src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2016-06-23 21:10:58 +02:00
Andy Scherzinger
7b27691a49 Renames due to https://github.com/nextcloud/android-library/pull/3 2016-06-23 14:44:44 +02:00
Andy Scherzinger
4e554c9245 fixed code duplicate 2016-06-22 16:43:25 +02:00
Andy Scherzinger
0db9c5e72d fix code review comments 2016-06-22 16:43:24 +02:00
Andy Scherzinger
2c256bf53d added the ability to select all within a folder for upload - selection is discarded when navigating folders 2016-06-22 16:43:23 +02:00
Timo Witte
bed46448c7 tidy up code based on feedback 2016-06-20 23:22:55 +02:00
Timo Witte
6401731e64 implement the same for videos and do some code cleanup 2016-06-20 23:22:54 +02:00
Timo Witte
f85cf5dcff use long for timestamp and don´t fail if timestamp is empty 2016-06-20 23:22:54 +02:00
Timo Witte
7f02bb0ff2 make InstantUploader honor the SubFolder setting 2016-06-20 23:22:53 +02:00
Timo Witte
23e1071451 introduce upload subfolders configuration variable 2016-06-20 23:22:52 +02:00
Bartosz Przybylski
6bab4f00f9 Review fixes 2016-06-20 22:15:03 +02:00
Andy Scherzinger
75e2659947 use proper app icon in documents provider 2016-06-20 22:15:02 +02:00
Bartosz Przybylski
db7a4641c2 Add documents provider 2016-06-20 22:15:02 +02:00
tobiasKaminsky
d2e05d1184 remove commented line 2016-06-20 21:24:14 +02:00
tobiasKaminsky
f1bd8fc59a linebreak 2016-06-19 21:24:59 +02:00
tobiasKaminsky
0e4243c996 hofix: https://github.com/nextcloud/server/pull/110 2016-06-19 21:24:36 +02:00
tobiasKaminsky
bed5a16e1f Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-06-19 18:23:06 +02:00
tobiasKaminsky
2c7256e835 Merge remote-tracking branch 'remotes/origin/videoBigThumbnails' into video_thumbnail 2016-06-19 18:22:45 +02:00
David A. Velasco
037535256e Recovered full port and path in accounts naming to distinguish instances in the same host 2016-06-16 14:36:08 +02:00
David A. Velasco
aa2b113ea5 Show display name in list of uploads 2016-06-16 14:36:08 +02:00
David A. Velasco
ea3cf41b99 Show display name in account selector of ReceiveExternalFilesActivity.java 2016-06-16 14:36:08 +02:00
David A. Velasco
282f62b735 Updated after renaming operation in OC library 2016-06-16 14:36:08 +02:00
David A. Velasco
0913e3f234 Display name is sync'ed whenever a refresh of root folder occurs 2016-06-16 14:36:08 +02:00
David A. Velasco
3584666cf6 Added operation to sync display name 2016-06-16 14:36:08 +02:00
David A. Velasco
95152a36e8 Show display name in navigation drawer 2016-06-16 14:36:08 +02:00
David A. Velasco
70e24ceabe Show display name in account selector 2016-06-16 14:36:08 +02:00
David A. Velasco
0f64fe48cd Undo buggy refactoring; too much to do in that sense to get it works 2016-06-16 14:36:08 +02:00
David A. Velasco
a74901203b Read and save display name when account is created 2016-06-16 14:36:08 +02:00
Andy Scherzinger
abe2b24f48 bugfix for image rendering 2016-06-14 13:29:12 +02:00
Andy Scherzinger
0db0ab1fd5 layouting changes so file list, local list and uploader list look the same 2016-06-14 09:55:24 +02:00
Andy Scherzinger
53a0da7021 revert filtering out files in the external file upload view 2016-06-14 09:55:23 +02:00
Andy Scherzinger
68849c7305 code review: fixed minor layout optimizations, set generic preference methods to private visibility 2016-06-14 09:55:22 +02:00
Andy Scherzinger
89dded113c fix preference manager call after rebase 2016-06-14 09:55:21 +02:00
Andy Scherzinger
26ef68a02a streamlined PrefManager API for simpler usage 2016-06-14 09:55:21 +02:00
Andy Scherzinger
5c72090ed2 removed now unused code 2016-06-14 09:55:20 +02:00
Andy Scherzinger
19c78855a0 moved the preference accessing to the oC Preference Manager 2016-06-14 09:55:19 +02:00
Andy Scherzinger
94a6bebb60 moved the preference accessing to the oC Preference Manager 2016-06-14 09:55:19 +02:00
Andy Scherzinger
1f4e9aa439 fix after rebase 2016-06-14 09:55:18 +02:00
Andy Scherzinger
8b04d61ff4 removed duplicate method call 2016-06-14 09:55:17 +02:00
Andy Scherzinger
ee7873d056 fixed menu, since grid view hasn't been part of the uploader screen 2016-06-14 09:55:17 +02:00
Andy Scherzinger
7c8fbf1ade Fixes after rebase 2016-06-14 09:55:16 +02:00
Andy Scherzinger
8d47b770aa implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-14 09:55:15 +02:00
Andy Scherzinger
d74f5fdc2a implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-14 09:55:14 +02:00
Andy Scherzinger
9e116e6a98 removed ImageView onDraw super call 2016-06-14 09:47:45 +02:00
Andy Scherzinger
d00cf73fee renamed method, changed input parameter + javaDoc 2016-06-13 22:25:04 +02:00
Andy Scherzinger
9eb6dc14ec moved up onDraw super call 2016-06-13 22:11:42 +02:00
Andy Scherzinger
82f9f338fd again, small formatting 2016-06-13 22:09:03 +02:00
Andy Scherzinger
6d7651eff9 return early 2016-06-13 22:09:02 +02:00
Andy Scherzinger
0a351f5899 formatting 2016-06-13 22:09:01 +02:00
tobiasKaminsky
4adecc96e8 changes due to CR 2016-06-13 22:09:01 +02:00
tobiasKaminsky
7e583891f0 - variables with m 
- onMeasure sets always width/height
 2016-06-13 22:09:00 +02:00
tobiasKaminsky
86b92a1753 add support for showing animated gifs in imagePreview 2016-06-13 22:08:59 +02:00
Andy Scherzinger
8073679c1b further review comments 2016-06-13 21:50:11 +02:00
Andy Scherzinger
944af7e62b code review plus fixed for the layouts and data to be displayed 
now all file list view (uploader, upload external and standard file list have the same layout)
 2016-06-13 21:50:11 +02:00
Andy Scherzinger
b5b1aab406 revert filtering out files in the external file upload view 2016-06-13 21:50:09 +02:00
Andy Scherzinger
e0a283a876 rebase changes with master 2016-06-13 21:50:08 +02:00
Andy Scherzinger
225cd2362f removed duplicate method call 2016-06-13 21:50:08 +02:00
Andy Scherzinger
60d71a9423 Fixes after rebase 2016-06-13 21:50:06 +02:00
Andy Scherzinger
74fa10964a implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:50:05 +02:00
Andy Scherzinger
1a12fe2409 fix preference manager call after rebase 2016-06-13 21:50:04 +02:00
Andy Scherzinger
63761039db streamlined PrefManager API for simpler usage 2016-06-13 21:50:04 +02:00
Andy Scherzinger
10594f490d removed now unused code 2016-06-13 21:50:03 +02:00
Andy Scherzinger
3b4304048b moved the preference accessing to the oC Preference Manager 2016-06-13 21:50:03 +02:00
Andy Scherzinger
a931baf8c6 moved the preference accessing to the oC Preference Manager 2016-06-13 21:50:02 +02:00
Andy Scherzinger
6a66b0a48f fix after rebase 2016-06-13 21:50:01 +02:00
Andy Scherzinger
af9c055f85 removed duplicate method call 2016-06-13 21:50:01 +02:00
Andy Scherzinger
3ca1033d7a fixed menu, since grid view hasn't been part of the uploader screen 2016-06-13 21:50:00 +02:00
Andy Scherzinger
df013d2b9c Fixes after rebase 2016-06-13 21:49:59 +02:00
Andy Scherzinger
f2e93657e3 implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:58 +02:00
Andy Scherzinger
cecab96b2f implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:57 +02:00
Andy Scherzinger
c9a3397aac minor search provider config 2016-06-09 19:16:14 +02:00
Andy Scherzinger
91682b616c replace launcher icon including seasonal icon removal 2016-06-09 17:52:35 +02:00
David A. Velasco
a12a1060ab Grant that 'upload permission' is not changed when other properties of public share are updated 2016-06-07 16:49:25 +02:00
Juan Carlos González Cabrero
90b6f19161 Don't show local remove for available offline files/folders 2016-06-06 10:28:39 +02:00
tobiasKaminsky
d6dcccf396 Merge remote-tracking branch 'remotes/upstream/master' into thumbnailDuringUpload 2016-06-05 17:49:27 +02:00
Juan Carlos González Cabrero
28f20ec3ef Check if the OCFile has a previous conflict before calling a sync operation 2016-06-02 12:40:09 +02:00
jabarros
a9a944799e Added and changed synchronizing, sync error and successfully synced icons 2016-06-01 17:07:13 +02:00
David A. Velasco
7f33ba5d4a Clear actions in menu don't deal with uploads waiting for Wifi as if were failed 2016-05-30 11:03:22 +02:00
David A. Velasco
d41accdb6a Removed classes for compatibility of notifications with Android API level lesser than 14, not supported any more 2016-05-30 10:45:01 +02:00
David A. Velasco
52d8b7c264 Prevent that upload-in-progress notification is shown for instant uploads unless they are really performed 2016-05-30 10:45:01 +02:00
David A. Velasco
dab4ef4550 Moved upload waiting for Wifi to the section 'current' in uploads view 2016-05-30 10:45:01 +02:00
David A. Velasco
a5ef75a840 Prevent error notification for delayed uploads waiting for Wifi 2016-05-30 10:45:01 +02:00
David A. Velasco
cfbe5498f8 Prevent that files sent to OC from other apps are duplicated in local storage 2016-05-27 12:46:01 +02:00
jabarros
7225b9f631 Fix. [BUG] Some storages do not work when uploading content from other apps Drive 2016-05-23 13:04:31 +02:00
David A. Velasco
e34d76a126 Minor changes 2016-05-23 13:04:31 +02:00
jabarros
34470186aa Final changes after CR 2016-05-23 13:04:31 +02:00
jabarros
7a46865c20 Second part of changes after CR 2016-05-23 13:04:31 +02:00
jabarros
36a0cd5a67 Changes after CR (WIP) 2016-05-23 13:04:31 +02:00
jabarros
2fadc0b62a Added comments and cleaned code 2016-05-23 13:04:31 +02:00
jabarros
eae1e54c85 Removed unused imports 2016-05-23 13:04:31 +02:00
jabarros
49bcfd04a3 Removed unused and commented code 2016-05-23 13:04:31 +02:00
jabarros
e0ec383fe4 Show waiting dialog when receiving external files 2016-05-23 13:04:31 +02:00
jabarros
1a18ca4186 Remove content resolver parameter from UriUploader constructor and renamed UriUloadResult var 2016-05-23 13:04:31 +02:00
jabarros
7b7b85d530 Added and managed result cases when upload uris 2016-05-23 13:04:31 +02:00
jabarros
e84bfdf4ef Refactor upload files code. Move to use UriUploader (WIP) 2016-05-23 13:04:31 +02:00
jabarros
f09fe374c0 Refactor upload files code (WIP) 2016-05-23 13:04:31 +02:00
jabarros
5948c1c387 Rename Uploader activity to ReceiveExternalFilesActivity 2016-05-23 13:04:31 +02:00
jabarros
ae63ec12b2 Changes after CR. Added silent error as Toast when error uploading a content uri file appears, or data file is not valid 2016-05-23 13:04:31 +02:00
jabarros
10b8f5ca4a Removed replacement of ':' character from file name when uploading it as content uri scheme 2016-05-23 13:04:31 +02:00
jabarros
b8b17d4941 Fix. Import file from external storage with '/' character is uploaded incorrectly 2016-05-23 13:04:31 +02:00
jabarros
a0f2e7ab23 Minor refactor and added CR comment 2016-05-23 13:04:31 +02:00
jabarros
47f0a24f93 Remove unused import 2016-05-23 13:04:31 +02:00
jabarros
76e88dcd2b Copy and upload the selected file when content type is uri 2016-05-23 13:04:31 +02:00
Andy Scherzinger
919fe916b6 cleanup since logging code has been implemented twice 2016-05-18 12:35:58 +02:00
Andy Scherzinger
e80d1465cd show log preference item only for debug mode or flag set true (false by default) 2016-05-18 12:35:58 +02:00
Andy Scherzinger
74a05bb2a9 moved logs from drawer menu to "More" section in the settings 2016-05-18 12:35:57 +02:00
jabarros
64c6e90724 Fix. Favorite setting is not remembered when modifying the local file 2016-05-18 11:03:32 +02:00
Luke Owncloud
e9f7fc40db if OCFile is null --> cannot delete ==> return false. 2016-04-29 19:51:01 +02:00
jabarros
61c6393f7f Change way of checking if host url needs to be tested due to only in one case it should not be checked 2016-04-29 09:53:45 +02:00
jabarros
d78c03351f Check if url is set in the activity creation and trigger server connection test 2016-04-29 09:53:45 +02:00
jabarros
aabdcaa04a Changes after CR 2016-04-28 11:26:06 +02:00
jabarros
bf0af8e3a6 Add comments and rename vars 2016-04-28 11:26:06 +02:00
jabarros
93cd2be3bb Change names of share features vars 2016-04-28 11:26:06 +02:00
jabarros
4899d0b851 Update UI to hide sections that are disabled according to setup variables 2016-04-28 11:26:06 +02:00
jabarros
4bdea46b63 Add configuration variables to setup and show or hide share feature on file menu 2016-04-28 11:26:06 +02:00
Lukas Reschke
5e65c15756 Update SamlWebViewDialog.java 2016-04-25 09:46:44 +02:00
Lukas Reschke
8af7a5f8cb Disable plugins and file access from the web view 
This is probably not required here and good practise as a further hardening.
 2016-04-25 09:45:30 +02:00
David A. Velasco
1f117f1242 Close softkeyboard when passcode is processed to prevent it's still visible in passcode-protected Uploader activity 2016-04-21 11:31:48 +02:00
David A. Velasco
bc353af37e Send update of share permissions in reshared remote shares 2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
9f51a01c82 Stop upload process from external apps with content scheme uris 2016-04-21 11:31:48 +02:00
David A. Velasco
3f46a83396 Improved SAML webview rendering for non-responsive IdPs 2016-04-21 11:31:48 +02:00
David A. Velasco
a97b6ca88f Fixed wrong conflict badge after resolving conflict with 'Keep both' 2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
bd96e2c9ce Refactor the check of last character of an OCFile parent path 2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
112cb65b1f Fix parent path build 2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
e615b9a20d Fix deleted file update in media scanner 2016-04-21 11:31:48 +02:00
David A. Velasco
04dc4b2f45 Fixed navigation to 'all files' to grant correct reuse of existing FileDisplayActivity in current task 2016-04-21 11:31:48 +02:00
David A. Velasco
154f6d03e0 Error correctly reported when share password could not be set, and clean-up of unused code for sharing via link 2016-04-21 11:31:48 +02:00
David A. Velasco
e43c1d6b3f Improved error handling when copying shared link to clipboard 2016-04-21 11:31:48 +02:00
David A. Velasco
01cfbdd166 Set dimensions of SamlWebViewDialog to match parent for improved compatibility with adaptive web authenticators 2016-04-14 11:25:25 +02:00
David A. Velasco
8118334678 Applied changes after CR 2016-04-14 09:39:10 +02:00
David A. Velasco
68b96ce0db Error dialogs in Uploader updated, both messages and implementation 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
9e36ae2238 Modify Uploader activity to be singleton in the activity stack, and assure finish when the upload scheme is file 2016-04-14 09:39:10 +02:00
David A. Velasco
0f65e3a667 Grant execution of temporary copy of content URIs in configuration changes (such as rotation) 2016-04-14 09:39:10 +02:00
David A. Velasco
9d005d636f Refatoring, warnings clean-up, improved error logic 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
c88350a50f replace path separator characters 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
738e23a055 Keep the activity with the waiting dialog till the copies finish 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
e1a9203c33 Fix async task call when no content uris received 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
314f1fbd1f Call to the async task with an uri array to iterate over it 2016-04-14 09:39:10 +02:00
David A. Velasco
6430ece72c Files received via content:// URIs are temporary copied BEFORE requesting their upload to FileUploader service [WIP] 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
ce7fa469a4 Refactoring on UploadFileOperation instances building 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
5c0e7e851f Fix extension parse error, and variable refactoring 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
e85640bd93 Remove unused method with app logic from the domain class OCUpload 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
fcdd464776 Refactor uploadFiles methods for 'file' schemes 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
3207654895 Fix index condition and handle null mimetype extensions 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
1b680c606b Update error handling parsing the received uri 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
59002bfb24 Fix lost extension for files with known mimetype 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
da6b0c0162 Update dialog for sharing no files to be more intuitive 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
996fdc4fa4 Remove useless code to identify pdf files 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
7d5a44b4e5 Refactor file handling when receive from external apps to upload 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
a0e442a8f2 Update library and remove old redirection check 2016-04-13 13:28:54 +02:00
Juan Carlos González Cabrero
1d30c83809 Minor changes from code review 2016-04-13 13:23:56 +02:00
Juan Carlos González Cabrero
9c617e993b Moved up the logic of the 'SSL untrusted' dialog to FileActivity to be shown in all refreshes 2016-04-13 13:23:56 +02:00
Juan Carlos González Cabrero
47560ea7d5 Avoid overlapping an existing dialog 2016-04-13 13:18:17 +02:00
Juan Carlos González Cabrero
50f829a250 Add check of SSL unverified to show a dialog 2016-04-13 13:18:17 +02:00
David A. Velasco
f6ea9b597a Merge branch 'master' into reliable_uploads_actions_uploads_view 
Conflicts FIXED in res/values/styles.xml (trivial)
 2016-03-30 13:27:09 +02:00
David A. Velasco
9de0ff8cd8 Fixed vertical spacing of cells in uploads view 2016-03-30 11:07:34 +02:00
David A. Velasco
da7fee4ee9 Invalidate progress bar every time the holding cell is requested for uploads in progress 2016-03-30 09:39:58 +02:00
David A. Velasco
04085bb223 Grant correct visibility of right button for reused cells in uploads view 2016-03-30 09:20:50 +02:00
David A. Velasco
e12e5e87c2 Limit number of successful uploads stored in DB, as stated in acceptance criteria 2016-03-29 19:22:49 +02:00
David A. Velasco
be00353096 No trash button for successful uploads 2016-03-29 17:42:14 +02:00
David A. Velasco
d098d07889 Grant that only one progress bar is bound to FileUploader service in uploads view 2016-03-29 16:58:27 +02:00
David A. Velasco
f1bd697d7f Navigation drawer updated when account is removed in settings, opening this from uploads view 2016-03-29 14:11:09 +02:00
Juan Carlos González Cabrero
9b85e57c8c Update local path of the uploads only if the behaviour is MOVE 2016-03-29 09:52:07 +02:00
Juan Carlos González Cabrero
60101fe349 Revert "Update local path of upload, for consistent move operations" 
This reverts commit 94aaff3af8.
 2016-03-29 09:12:51 +02:00
David A. Velasco
163e9e7bbe Uploads delayed for Wifi processed as any other upload -> notifications sent, uploads view refreshed correctly 2016-03-28 15:14:03 +02:00
Juan Carlos González Cabrero
94aaff3af8 Update local path of upload, for consistent move operations 2016-03-28 13:59:26 +02:00
Juan Carlos González Cabrero
1c701fbc00 Avoid storing upload if it ias already in current queue 2016-03-28 11:31:37 +02:00
Juan Carlos González Cabrero
467071321f Remove unique upload by his ID when it already exists in current ones 2016-03-28 11:10:48 +02:00
tobiasKaminsky
bcbb365657 Create thumbnail during instant upload 2016-03-27 16:45:53 +02:00
Juan Carlos González Cabrero
cbf619be77 Add listener to let FileUploader know about a rename 2016-03-22 13:35:07 +01:00
Andy Scherzinger
cef29b48a3 fixed uploader warning icon in AlertDialog 2016-03-22 13:29:23 +01:00
Andy Scherzinger
8758c58814 fixed uploader warning icon in AlertDialog 2016-03-22 13:29:23 +01:00
Andy Scherzinger
c32ce5b9d5 fixed headline for share file fragment 2016-03-22 13:29:23 +01:00
Andy Scherzinger
c96be51151 fixed headline for edit share fragment 2016-03-22 13:29:23 +01:00
Andy Scherzinger
d893654bc1 Fix Headline in share edit and user search 2016-03-22 13:29:23 +01:00
Andy Scherzinger
6aa2d75f89 adding user/group icon to search suggestions 2016-03-22 13:29:23 +01:00
Andy Scherzinger
bad01a8488 add icon logic for user/group 2016-03-22 13:29:23 +01:00
Andy Scherzinger
7fe4de73f3 search view using AppCompat implementation + layout optimizations 2016-03-22 13:29:23 +01:00
Andy Scherzinger
e195cdadd8 redone layouting ans AppCompat switch implementation 2016-03-22 13:29:23 +01:00
David A. Velasco
eae56238f9 Rewired code path to upload files sent from other apps 2016-03-22 12:24:45 +01:00
Juan Carlos González Cabrero
def9478d44 Update remote path of the upload in the database just after rename 2016-03-22 10:47:04 +01:00
David A. Velasco
15eb8b493b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-21 17:42:13 +01:00
Juan Carlos González Cabrero
9422b77ab7 Remove cancel when it is cancelled 2016-03-21 14:22:45 +01:00
Juan Carlos González Cabrero
94864bb094 Update strings, comments and removed some conditions 2016-03-21 09:45:27 +01:00
Juan Carlos González Cabrero
ac6d0038ec Enable change the permission when the capability is unknown too 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
3d8195795b Revert "Refactor calls to find views in ShareFileFragment" 
This reverts commit 6143872543d30569e46fb4c5edc559f26cdd8bd6.
 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
ceffd197a9 Refactor calls to find views in ShareFileFragment 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
02eade8029 Hide edition of public share when the related capability is disable 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
ee22243bb0 New Intent to request the share permission update, and fragment update to manage the event correctly 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
55fdcee912 New switch in share via link to allow editing 2016-03-21 09:31:34 +01:00
David A. Velasco
f37c622f23 Reviewed closure of Cursors in UploadsStorageManager 2016-03-18 14:16:44 +01:00
Juan Carlos González Cabrero
b1d46eb8ab Change error label for uploads when app is killed 2016-03-18 14:03:33 +01:00
David A. Velasco
ae67c0c878 Fixed comparator - upload really in progress now REALLY on the top 2016-03-18 13:37:21 +01:00
David A. Velasco
b305e20b83 Remove sticky broadcast when read in UploadListActivity 2016-03-18 13:29:46 +01:00
Juan Carlos González Cabrero
f150dce25c Refactor clear options for uploads avoiding clear the current ones 2016-03-18 09:22:42 +01:00
David A. Velasco
8b85a7345b Show account info in uploads in progress 2016-03-17 15:22:00 +01:00
David A. Velasco
1527cb86fc Grant that uploads view shows the correct title always, no matter if entering from notifications 2016-03-17 15:10:35 +01:00
David A. Velasco
babf24c2ee Map SSL specific errors to UploadResult.NETWORK_CONNECTION error too 2016-03-17 14:31:54 +01:00
David A. Velasco
86ade9d8c4 Fixed recovery of instant videos, and of every instant after adding DELAYED_WIFI as an UploadResult 2016-03-17 14:31:54 +01:00
Juan Carlos González Cabrero
f76ad79d4b Invalidate click listener on uploads not allowed to retry 2016-03-17 14:07:37 +01:00
David A. Velasco
e181253410 Retrying an upload failed due to wrong credentials checks if stored credentials were already updated before asking to the user 2016-03-17 13:23:25 +01:00
Juan Carlos González Cabrero
9c50fea5c8 Fix action bar title logic for uploads view 2016-03-17 11:41:34 +01:00
David A. Velasco
0e8537bffc 'Waiting for upload' shown in uploads in line, but not currenlty transferred 2016-03-16 19:30:58 +01:00
David A. Velasco
8c523b5fcc Fixed manual retry of upload failed due to credentials error 2016-03-16 19:23:10 +01:00
David A. Velasco
772d640bc8 Fixed status message in uploads view 2016-03-16 19:17:01 +01:00
Juan Carlos González Cabrero
f8f4c1ed43 Code Review changes done 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
c6a82c0a87 Separate share permissions update logic 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
b16a32dfec Fixed refresh of share icon when the share is deleted 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
6755453fa1 Fix suboptions display in 'can edit' option for folders 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
bdb7ecbc31 Change 'equals' method calls to be null safe 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
a969250b23 Adapt autocompletion to the web UI 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
eb783a0545 Update PR #1492 with the code review suggestions 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
87b2f25350 Enable autocompletion of federated shares with well known servers 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
7c1f8e0370 Disable the remote user suggestion when the capabilities does not allow federate sharing 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
28d90ac106 Hide the 'can share' option for federated shares in files, wich is not allowed 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
449f4567f2 Showing the federated shares in the shares view of a file or folder 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
49daadefba Revert the name fix wich was corrupting the database 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
f2d05a3554 Set appropiate permissions for the federated shares for the operation request 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
f60aa06c2d Send the right ShareType to the share operation if it is FEDERATED 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
a7efcf6a2f Add the remote suggestion to the MatrixCursor instead of the JSON array, wich could not parse the path correctly 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
87c3ec4c60 Added remote user suggestion when '@' is detected in the search field 2016-03-16 13:46:05 +01:00
David A. Velasco
26d748a2d3 Upload really in progress always and only in top of the list of current uploads 2016-03-15 18:44:53 +01:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
David A. Velasco
945841203c Grant renewal ownCloudClients managed in SessionManager after updating credentials 2016-03-14 14:07:20 +01:00
David A. Velasco
d053f34b8f Simplify checks of authentication needed after change in library; as a side effect, uploads failed due to SAML session expired are stored with right 'credentials error', instead of 'unknown' 2016-03-14 09:31:38 +01:00
David A. Velasco
e78bf9179b Allow retry of failed uploads of accounts different than the current one 2016-03-09 18:34:38 +01:00
David A. Velasco
5694915151 Recovery of FileUploader after sudden death 2016-03-09 17:21:52 +01:00
Thomas Müller
ea2fe8cb4e Merge pull request #1399 from owncloud/uploadShowsFiles_Master 
Upload shows files
 2016-03-09 13:10:53 +01:00
David A. Velasco
7980afbef8 Retry all failed uploads when option item 'retry failed' is tapped 2016-03-08 16:24:09 +01:00
David A. Velasco
ec9b705536 Wording and padding fixes in uploads list 2016-03-08 13:17:55 +01:00
David A. Velasco
4f962aeb2d Added 'event' to notify activities when new uploads are added to the queue of pending uploads, so that the uploads list is better refreshed when several retries are triggered 2016-03-08 11:40:46 +01:00
David A. Velasco
d9bb808308 BUG fixed: store file size with upload info to show correctly 2016-03-07 15:17:40 +01:00
David A. Velasco
d93397a58f Changes from my own CR 2016-03-04 12:51:39 +01:00
David A. Velasco
5707fce666 Fixed crash due to lifecycle of registered SyncBroadcastReceiver 2016-03-04 11:46:12 +01:00
Andy Scherzinger
f34a9ddf5b moved requestCode to Fragment 2016-03-03 21:44:28 +01:00
Andy Scherzinger
8d038e89a9 removed unused createFolder(), since this is now covered by the fab implementation in the fragment 2016-03-03 21:40:12 +01:00
David A. Velasco
beb10a91cd Uploads over settings in navigation drawer 2016-03-03 13:00:32 +01:00
David A. Velasco
52d05b37d4 Enabled again 'basic' recovery of instant uploads on WiFi connection 2016-03-03 12:52:16 +01:00
Andy Scherzinger
4327cf5433 code review: fixed java doc 2016-03-03 12:50:43 +01:00
Andy Scherzinger
7e82baa8bc cleanup for code review duplicate code for upload activity calls. 2016-03-03 12:50:28 +01:00
David A. Velasco
091985650b Remove from database uploads cancelled in batch when an account is removed while uplading 2016-03-02 18:38:00 +01:00
David A. Velasco
c5825a4e07 Refactoring: static methods to ease requests to FileUploader are grouped in a single class 2016-03-02 18:17:13 +01:00
David A. Velasco
fbfb5d56b4 Removed cancellation of all the uploads when Wifi is lost, not needed anymore after FileUploader refactoring 2016-03-02 17:06:12 +01:00
Andy Scherzinger
e4d936e837 changes due to code review 2016-03-02 14:34:33 +01:00
masensio
573d94453b Delete context menu in UploadListFragment 2016-02-26 14:34:41 +01:00
masensio
8006c893f9 Clean code, from uploads view implementation 2016-02-26 14:15:42 +01:00
masensio
55a33d8848 Change names in uploads comparator 2016-02-26 13:50:24 +01:00
Andy Scherzinger
413707272a rebased to master: resolved conflicts (edits from fab implementation) 2016-02-25 19:38:24 +01:00