3554 commits

Author	SHA1	Message	Date
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
Andy Scherzinger	d4ce0d920f	hide FAB in copy/move folder chooser	2016-02-25 18:07:49 +01:00
Andy Scherzinger	4ecf325ea6	close logic on back pressed for drawer/fab/up-navigation	2016-02-25 18:07:29 +01:00
Andy Scherzinger	d7ff626db3	added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions	2016-02-25 18:07:29 +01:00
Andy Scherzinger	e8c64ebf8d	initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi	2016-02-25 18:07:28 +01:00
Andy Scherzinger	e0bacfaaea	initial implementation of the FAB with Speed Dial	2016-02-25 18:07:11 +01:00
masensio	c0cf6d8788	Use Upload End Time in Uploads View	2016-02-25 15:32:12 +01:00
Juan Carlos González Cabrero	2682b1fd3d	Upload path update after renaming	2016-02-25 12:27:18 +01:00
David A. Velasco	fcf107005f	Merge pull request #1486 from owncloud/reliable_uploads_actions_uploads_view__credentials_error ... Fix problems with Credentials error in uploads	2016-02-24 10:46:37 +01:00
Juan Carlos González Cabrero	a506014d58	Checking of local file when an upload retry is requested	2016-02-24 10:41:50 +01:00
masensio	531615c077	Changes from code review comments	2016-02-24 10:37:50 +01:00
masensio	ae5605e55b	Fix problems with Credentials error in uploads	2016-02-24 10:37:13 +01:00
David A. Velasco	d2940f6214	Used OC trashbin icon in uploads view	2016-02-24 10:11:54 +01:00
David A. Velasco	0ec9543671	Remove progress bubble in uploads list as soon as pull-2-refresh is triggered	2016-02-23 17:57:53 +01:00
David A. Velasco	de1f34c493	Delay instant uploads when WiFi requirement is not met, and show as failed uploads in uploads list	2016-02-23 17:01:51 +01:00
David A. Velasco	5eeca847d1	Remove uploads from persisted list when cancelled	2016-02-23 13:56:23 +01:00
Juan Carlos González Cabrero	d49379abf8	Refactorized UploadStatus to have only 3 types of Status	2016-02-23 12:56:07 +01:00
Juan Carlos González Cabrero	a3aaca9ca3	Fixed the crash uploading without connection	2016-02-23 11:33:42 +01:00
David A. Velasco	245e8fe5c7	'Wifi-only' condition for instant uploads fixed - uploads are not done if connection is not through Wifi	2016-02-23 09:09:04 +01:00
David A. Velasco	366a1f7c51	Reconnect cancellation of uploads when Wifi is lost to interrupt only-wifi instant uploads	2016-02-22 14:37:36 +01:00
Juan Carlos González Cabrero	c0d0356821	Avoid rebuilding of the UploadListFragment	2016-02-22 14:13:00 +01:00
Juan Carlos González Cabrero	ee66791dcb	Deleted keySuffix parameter from putIfAbsent method, wich was corrupting the path	2016-02-22 10:24:07 +01:00
David A. Velasco	286dc8fafd	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-22 10:21:46 +01:00
David A. Velasco	c9ad19692f	Simplified FileUploader - UploadFileOperation gets responsibility to update local data as a new SyncOperation	2016-02-22 09:25:42 +01:00
Juan Carlos González Cabrero	9acb660165	Avoid storing an OCFile before the upload is completed	2016-02-22 09:20:52 +01:00
Maria Asensio	f88ab60a78	Merge pull request #1191 from owncloud/cancelUploadOnWlanExit ... Cancel upload on wlan exit	2016-02-19 15:08:13 +01:00
David A. Velasco	e5fbc8fed9	Refactoring UploadFileOperation.java	2016-02-19 13:38:59 +01:00
Juan Carlos González Cabrero	6e63e65f2d	Calls to the FileUploader service refactored and fixed	2016-02-19 12:52:22 +01:00
Maria Asensio	482d43a08d	Merge pull request #1473 from owncloud/target_marshmallow_rebased ... Move to compile target Marshmallow (Android 6 - v23) - rebased without FAB	2016-02-19 11:28:05 +01:00
David A. Velasco	1f3ff26001	Fixed broken initialization of UploadFileOperation	2016-02-19 11:08:49 +01:00
David A. Velasco	57de2968fb	Removed dependency of OCUpload on OCFile	2016-02-19 10:06:55 +01:00
Juan Carlos González Cabrero	5fd891413e	Line wrapping and getApplicationContext calls removed from last commit	2016-02-19 09:27:15 +01:00
Juan Carlos González Cabrero	e6cfedc285	Changed calls to FileUploader service to static methods to manage service Intents internally	2016-02-18 14:14:32 +01:00
Juan Carlos González Cabrero	d5fa3a5578	Retry action on list items of Updates view like in iOS	2016-02-18 10:21:03 +01:00
Juan Carlos González Cabrero	413d491112	Update uploads view when finish upload is deleted	2016-02-18 09:38:51 +01:00
David A. Velasco	40e9bb0529	Merged FileUploadService into FileUploader to avoid that changes from other branches are circumvented	2016-02-18 09:30:35 +01:00
David A. Velasco	cfcb18eb54	Saving new file to be uploaded for the first time with the correct reference to its parent folder	2016-02-17 17:46:16 +01:00
David A. Velasco	f58c19bb55	Minor fixes from own CR	2016-02-16 17:05:27 +01:00
Juan Carlos González Cabrero	91156063d2	'Clear all uploads' option implemented	2016-02-16 09:37:30 +01:00
David A. Velasco	89870064dc	Merge pull request #1470 from owncloud/bug_7541 ... Fixes app crash when malformed URL is entered in login view.	2016-02-16 09:06:01 +01:00
David A. Velasco	82b0b7a84f	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero	9fe62d15ea	Refresh listview when clear failed/finished uploads clicked	2016-02-15 10:58:53 +01:00
David A. Velasco	53df867a3c	Removed dependency on org.apache.http.legacy.jar	2016-02-12 13:32:57 +01:00
Andy Scherzinger	9bdfc304c6	Move to NotificationCompat.Builder to create/replace notification (done for Android M compatibility @ compile target)	2016-02-12 12:39:46 +01:00
Andy Scherzinger	f85640527e	use API for coloring	2016-02-12 12:31:59 +01:00
Andy Scherzinger	999ad9f355	refactored permission handling to separate class	2016-02-12 12:31:59 +01:00
Andy Scherzinger	55b4952687	fixed snackbar coloring of the action button	2016-02-12 12:29:05 +01:00
Andy Scherzinger	9d9bc6958b	changes color of the OK button and the text	2016-02-12 12:29:05 +01:00
Andy Scherzinger	cbf134a6e2	move strings to resource file	2016-02-12 12:29:05 +01:00
Andy Scherzinger	4410bd9c60	add snackbar and check for write permission via API	2016-02-12 12:15:46 +01:00
Juan Carlos González Cabrero	2ca29f3e29	Fixes #7541: Catched invalid argument in URI parsing	2016-02-09 12:41:36 +01:00
David A. Velasco	ea1e67595c	Prevent that lost waiting dialogs block operation after tricky rotations	2016-02-09 09:54:31 +01:00
David A. Velasco	3885db5013	Positive button of remove dialog(s) changed to 'Yes'	2016-02-09 08:59:35 +01:00
David A. Velasco	99c89e52ae	Fixed multiple upload from external apps for Android 4.3+	2016-02-09 08:43:27 +01:00
tobiasKaminsky	3ce879be24	according to CR	2016-02-05 17:27:35 +01:00
David A. Velasco	106db02dee	Prevent crash when there are federated shares in the server	2016-02-05 14:28:57 +01:00
David A. Velasco	d23897c085	Fixed wrong set of incomplete password using 'cancel' button	2016-02-05 10:18:08 +01:00
masensio	7548964b37	Fix: App freezes when the data are cleared with an opened text file	2016-02-04 12:10:19 +01:00
David A. Velasco	b343896447	Fixed NullPointerException after clearing app data when left from image preview	2016-02-04 08:41:55 +01:00
masensio	9fd38ca0dd	Changes from comments in Code Review: staring and NPE	2016-02-03 16:03:10 +01:00
masensio	dc2fdb9744	Changes from comments in Code Review: Strings and minor things	2016-02-03 14:28:12 +01:00
masensio	71d7c52e12	Use PassCode static values instead of literal strings	2016-02-03 13:50:43 +01:00
masensio	14530aa7b8	Changes from comments in PR Code Review	2016-02-03 13:45:53 +01:00
masensio	9e83827cc4	Delete settings in Clear Data method	2016-02-03 13:37:48 +01:00
masensio	491a8b71a2	Fix crash when Clear App Data and try to access	2016-02-03 13:37:45 +01:00
masensio	96ce49707b	Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity	2016-02-03 13:37:45 +01:00
masensio	d6653ef684	Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java	2016-02-03 13:37:43 +01:00
tobiasKaminsky	145eb20a3d	Merge remote-tracking branch 'remotes/upstream/master' into cancelUploadOnWlanExit_2	2016-02-02 21:50:50 +01:00
tobiasKaminsky	49f6d9c986	according to CR	2016-02-02 21:50:33 +01:00
tobiasKaminsky	0e89c1f01b	solved bug	2016-02-02 21:13:41 +01:00
tobiasKaminsky	da0d98629c	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master	2016-02-02 21:05:16 +01:00
David A. Velasco	831de4534e	Merge pull request #1296 from owncloud/bug_1251 ... Don't allow to remove passcode without entering it, nor set it incomplete	2016-02-01 12:52:36 +01:00
masensio	8c5b1e6e47	Sort uploads: the latest the first shown	2016-01-28 10:03:38 +01:00
masensio	f5eb35c313	Max length of uploads shown = 30.	2016-01-27 17:14:07 +01:00
masensio	ea77bf553e	Show thumbnails taking into account the upload status	2016-01-27 15:41:54 +01:00
masensio	9c57aafab5	Review appereance of Uploads View	2016-01-27 13:59:51 +01:00
David A. Velasco	a4e336acc2	Removed automatic back-browse; error codes from server do not distinguish between excess of permissions, removed share or removed file	2016-01-27 13:13:23 +01:00
David A. Velasco	c9017a2b0a	Fixed operation of app after SAML expired sessions while editing share permissions	2016-01-27 11:09:24 +01:00
masensio	b59b0283bd	Review uploads for favourite files	2016-01-26 18:28:13 +01:00
masensio	44f2894731	Checking Uploads with the same name	2016-01-26 17:53:13 +01:00
masensio	2f231561af	Checking Priviledges Error failed uploads	2016-01-25 15:20:50 +01:00
masensio	29cb1277c3	Checking File Error failed uploads	2016-01-25 14:54:31 +01:00
masensio	15d5350ef6	Checking Folder Error failed uploads	2016-01-25 14:23:23 +01:00
masensio	198c1bf3b0	Checking Credential Error failed uploads: show error as Credential error and relogin	2016-01-25 13:02:22 +01:00
David A. Velasco	2681f8c22b	Improved navigation after errors due to removal of shares, files or users from a separate client	2016-01-25 11:08:28 +01:00
masensio	b6f8e93504	Checking Network Connection failed uploads	2016-01-25 10:59:53 +01:00
David A. Velasco	6ac53bc1ba	Grant that UI is correctly refreshed on rotations	2016-01-25 09:42:02 +01:00
David A. Velasco	2f1084012f	Tweaked UI behaviour for resharing folders with partial edit permissions	2016-01-25 08:25:24 +01:00
tobiasKaminsky	1023aa1eba	update todo	2016-01-24 08:39:10 +01:00
tobiasKaminsky	cc637a61c6	add lastMod	2016-01-24 08:33:36 +01:00
Andy Scherzinger	cc8df75355	fix NPR (Uploader doesn't have a progressbar, so we can't set a status for it (!)	2016-01-22 22:16:03 +01:00
masensio	66ec45f633	Review behaviour of failed uploads: list in uploads view	2016-01-22 10:59:43 +01:00
masensio	814a70f6a3	Update refresh icon in uploads view	2016-01-20 18:41:52 +01:00
David A. Velasco	628e713268	Update model changed: permission updates are requested to the server as soon as the user changes any value	2016-01-20 18:18:14 +01:00
masensio	b353ed62cd	Show thumbnail or file icon depending on the file type in Uploads view	2016-01-20 18:06:35 +01:00
masensio	6448857a55	Fix problem with instant upload when parent folder is not created before	2016-01-20 14:24:23 +01:00
David A. Velasco	0d4c9b9961	Show error message from server when update of permissions fail	2016-01-20 12:22:24 +01:00
David A. Velasco	83092452a2	Dynamic retrieval of maximum permissions allowed to reshare is not trustful - removed	2016-01-20 11:57:53 +01:00
masensio	2c4daf3a93	Update the status of current upload when it finishes	2016-01-20 11:19:43 +01:00
masensio	6f58527273	Update progress bar for Current Upload	2016-01-19 17:32:50 +01:00
masensio	6a8d0383c6	Show current uploads in uploads list view. Apply code review changes, merging FileUpload + FileUploadService	2016-01-18 14:20:55 +01:00
David A. Velasco	3b4b8ceadd	Dinamycally find out the maximum permissions to reshare	2016-01-18 14:08:38 +01:00
masensio	373daff473	Third step: merging services FileUploader + FileUploadService	2016-01-15 15:03:27 +01:00
masensio	3a908b8c1d	Second step: merging services FileUploader + FileUploadService	2016-01-15 11:06:12 +01:00
masensio	92c33d932c	First step to add lastest changes in FileUploader into FileUploadService	2016-01-14 13:27:12 +01:00
Andy Scherzinger	341abcd358	move to progress bar instead of unsupported legacy Indeterminate platform calls	2016-01-12 23:08:06 +01:00
masensio	2ec9899060	Show null path in uploads view	2016-01-12 18:28:22 +01:00
masensio	8c71b9ec29	Clean FileDisplayActivity: delete comments from merge conflicts and casting (Parcelable) on OCFile objects	2016-01-12 16:28:35 +01:00
masensio	990f16ca47	Add drawe access from uploads view	2016-01-12 14:16:22 +01:00
David A. Velasco	e7901656a1	Polish UI to edit permissions	2016-01-11 15:34:41 +01:00
masensio	de39244b83	Fix problems with DB access after updating upload	2016-01-11 14:51:41 +01:00
David A. Velasco	bba66e773d	Reset state of check boxes if update of privileges fails	2016-01-11 12:17:46 +01:00
David A. Velasco	6f5d09ada2	Update share permissions when 'DONE' button is clicked	2016-01-11 12:17:45 +01:00
David A. Velasco	d826451e2d	Added buttons to unshare (working) and finish (not working) in EditShareFragment layout	2016-01-11 12:17:11 +01:00
David A. Velasco	5fcb70beee	Added fragment to edit share permissions with basic layout	2016-01-11 12:17:08 +01:00
tobiasKaminsky	021fe9d14b	changes according to CR	2016-01-10 20:17:21 +01:00
masensio	2181239c6d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-01-08 11:21:23 +01:00
David A. Velasco	ffbd118e8d	Removed calls to ApplicationContext and minor refactoring	2016-01-05 12:03:02 +01:00
David A. Velasco	4ec4b66921	Fix update of text in menu after removal of static methods	2016-01-05 12:03:00 +01:00
tobiasKaminsky	337191ff1a	minor code optimizations	2016-01-05 12:02:59 +01:00
tobiasKaminsky	45c82e4fed	removed static functions (according to CR)	2016-01-05 12:02:57 +01:00
tobiasKaminsky	9bcef74f6d	changes according to CR	2016-01-05 11:54:55 +01:00
tobiasKaminsky	cd04b0d389	do not show "switch" menu item on file details/preview text/video/audio	2016-01-05 11:50:03 +01:00
tobiasKaminsky	6920a7495e	do not show "switch" menu item on file details/preview text/video/audio	2016-01-05 11:50:02 +01:00
tobiasKaminsky	d7e9ef92b8	fixed according to review	2016-01-05 11:50:00 +01:00
tobiasKaminsky	db46b19824	decision grid vs. list view remembered per folder, inherited by parents	2016-01-05 11:20:08 +01:00
tobiasKaminsky	6bd7065c73	wip	2016-01-05 11:16:00 +01:00
tobiasKaminsky	323bef93a9	change due to merge	2015-12-31 13:33:46 +01:00
tobiasKaminsky	b2ae3fa467	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles	2015-12-31 13:26:36 +01:00
masensio	aeaa422fed	Close cursors in UploadStorageManager methods	2015-12-29 13:22:31 +01:00
masensio	540d123ad5	Merge branch 'master' into reliable_uploads_actions_uploads_view	2015-12-29 12:46:45 +01:00
Andy Scherzinger	a812784ddd	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts (resolved): res/layout/drawer.xml res/values/colors.xml res/values/setup.xml	2015-12-28 20:03:25 +01:00
Andy Scherzinger	cc2ba716fb	Merge branch 'material_buttons' of https://github.com/owncloud/android into material_buttons	2015-12-28 19:22:40 +01:00
Andy Scherzinger	dd8c65dcd9	fix for #1381	2015-12-28 19:21:05 +01:00
masensio	aca6e66d19	Optimize set for boolean parameters in UploadsStorageManager. Fix problem in Uploads DB creation method	2015-12-28 15:04:33 +01:00
masensio	eee7ea369d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2015-12-28 10:13:38 +01:00
Bartosz Przybylski	3f61dc5a8a	#1338: Correctly use delayUntil property of SyncResult	2015-12-18 15:55:05 +01:00
David A. Velasco	d5c4d7ab92	Changes from code review	2015-12-17 15:49:55 +01:00
masensio	e89104b40e	Save OCFile into DB when a file is prepare to be uploaded, before uploading (WIP)	2015-12-16 09:17:35 +01:00
masensio	390e06efa8	Adapt UploadDBObject (new OCUpload) to manage uploads data	2015-12-15 13:00:38 +01:00
David A. Velasco	41f1924bb6	Access to Uploads table through ContentResolver instead of direct access as DB	2015-12-11 15:40:59 +01:00
masensio	10874aa7a7	Add new table for uploads on database	2015-12-11 14:35:45 +01:00
masensio	1a74d5ba59	Changes from comments in reliable_uploads code review	2015-12-11 11:15:53 +01:00
masensio	a840e67a68	Add 'Uploads' option into NavigationDrawer	2015-12-11 08:43:33 +01:00
masensio	a2b680edd0	Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view	2015-12-10 17:35:32 +01:00
masensio	dc0aea30f0	Merge branch 'master' into reliable_uploads ... Conflicts: AndroidManifest.xml res/values/strings.xml src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/db/ProviderMeta.java src/com/owncloud/android/files/FileMenuFilter.java src/com/owncloud/android/files/FileOperationsHelper.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/operations/SynchronizeFolderOperation.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/utils/FileStorageUtils.java	2015-12-10 17:18:52 +01:00
Andy Scherzinger	71e87d98a8	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-12-09 15:14:22 +01:00
Maria Asensio	896e4859c0	Merge pull request #1168 from owncloud/avoidDuplicateFiles ... Avoid duplicate files	2015-12-09 09:27:54 +01:00
tobiasKaminsky	e9bf119fa4	avoid NPE	2015-12-02 20:23:07 +01:00
tobiasKaminsky	9e678fc697	changed according to latest comments	2015-12-02 19:55:41 +01:00
tobiasKaminsky	04fc2e3cc2	changed according to latest discussion	2015-12-01 22:00:53 +01:00
masensio	a7304351b1	Fix issue 1319: Error on the preview, Android 4.1.2	2015-12-01 16:08:01 +01:00
David A. Velasco	d1a06c2dd3	Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread	2015-12-01 13:20:50 +01:00
Andy Scherzinger	4f7d416b81	BugFix for #1312 - setting ListPreference selection on pre kitkat	2015-11-30 14:22:52 +01:00
tobiasKaminsky	5d77cfc62d	fix 1313	2015-11-27 17:11:13 +01:00
masensio	49f593ecd1	Fix bug: App crash when try to share link with api disabled	2015-11-26 14:07:32 +01:00
masensio	b5ef1698bd	Fix bug related with sharee with special characters	2015-11-26 14:07:31 +01:00
David A. Velasco	0ab80ee4d2	Fixed stalled connections when a thumbnail that cannot be generated by the server is requested several times	2015-11-26 14:00:52 +01:00
David A. Velasco	40d1961e66	Fixed bug: a file already shared with users couldn't be shared via link	2015-11-25 09:47:38 +01:00
David A. Velasco	7277d0a840	Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread	2015-11-25 09:42:19 +01:00
David A. Velasco	854d333bd8	Silently handle remote folders removed while a full account refresh is run	2015-11-25 09:42:18 +01:00
David A. Velasco	0199ef3ef2	Fixed NPE in synchronization of full account	2015-11-25 09:42:17 +01:00
David A. Velasco	538af7d36b	Added error messages on view for sharees searching	2015-11-25 09:42:16 +01:00
David A. Velasco	5c24e55421	Grant that ShareActivity is correctly refreshed if public share was removed in the server ... Updated library reference after merge in master	2015-11-25 09:33:37 +01:00
David A. Velasco	00a4ba4f52	Retry forbidden share adding a password only if the value of 'enforce password' option is unknown	2015-11-25 09:32:35 +01:00
David A. Velasco	5384f6ff86	Fixed bug: grant that paused FileActivity behind ShareActivity is not registered as a listener with OperationService when the devide is rotated, preventing CRASH when password is enforced in server	2015-11-25 09:32:33 +01:00
David A. Velasco	9b4d153e90	Updated handling of enforced password for public shares depending on server capabilities	2015-11-25 09:32:32 +01:00
David A. Velasco	f5369ac4b2	Hide UI elements about public share when this is disabled in the server	2015-11-25 09:32:31 +01:00
David A. Velasco	b368a4b853	Removed useless code	2015-11-25 09:32:29 +01:00
masensio	030eaffcfc	List view is shown completelly on the ShareFileFragment	2015-11-25 09:32:27 +01:00
masensio	e08513a762	Delete any rest of old public share/unshare flow	2015-11-25 09:32:26 +01:00
masensio	68550e9977	Implement 'Get link' button	2015-11-25 09:32:25 +01:00
David A. Velasco	6c1c63ac16	Show current expiration date selected in date picker while modifying it	2015-11-25 09:32:23 +01:00
David A. Velasco	3d7278f470	Modify current expiration date on touch in expiration label or value	2015-11-25 09:32:22 +01:00
David A. Velasco	494267ad15	Modify current password on touch in password label or value	2015-11-25 09:32:21 +01:00
David A. Velasco	ad7666370f	Set or clear expiration date to protect public link in ShareFileFragment	2015-11-25 09:32:20 +01:00
David A. Velasco	729a9b7c77	Set or clear password to protect public link in ShareFileFragment	2015-11-25 09:32:19 +01:00
David A. Velasco	19cf573db0	Unshare public link in ShareFileFragment	2015-11-25 09:32:17 +01:00
David A. Velasco	261299cf23	Share public link in ShareFileFragment	2015-11-25 09:32:16 +01:00
David A. Velasco	f1b3208f1a	Updated ShareFileFragment layout with extra section for public shares	2015-11-25 09:32:15 +01:00
Andy Scherzinger	ecdb95fa0c	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-11-22 17:10:37 +01:00
tobiasKaminsky	d901208c1f	rename file is not working across mount points: therefore copying it and then delete	2015-11-22 13:22:59 +01:00
tobiasKaminsky	4471d3beb9	changes according to CR (code review)	2015-11-21 09:03:53 +01:00
tobiasKaminsky	2aac1e5270	Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master	2015-11-21 08:48:40 +01:00
Maria Asensio	08be3d3433	Merge pull request #1119 from owncloud/strip-index-php-from-server-url ... Strip away index.php/apps/files to allow copy pasting from the server	2015-11-20 12:24:11 +01:00
Bartosz Przybylski	bb7e95739a	Don't allow to remove passcode without entering it. Don't allow to set incomplete passcode,	2015-11-19 20:53:08 +01:00
David A. Velasco	257a9ec0a9	Merge pull request #1274 from owncloud/read_capabilities_for_showing_share_options ... Adapt availability of "Share with users" depending on server capabilities	2015-11-12 10:32:36 +01:00
masensio	35922a08c1	Read capabilities for showing Share Options ... Updated library reference after merge in master	2015-11-12 10:28:37 +01:00
Maria Asensio	80aacce3f3	Merge pull request #1269 from owncloud/fix_video_not_previewed ... Fix video not previewed #1180	2015-11-11 17:13:42 +01:00
David A. Velasco	4326883490	Minimal cleaning	2015-11-06 19:47:19 +01:00
David A. Velasco	2477d496e3	Fixed local URI to video files passed to VideoView	2015-11-06 15:02:57 +01:00
Andy Scherzinger	c31f602fd1	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/list_item.xml	2015-11-06 11:38:51 +01:00
Maria Asensio	19cce9c90f	Merge pull request #1184 from Wikinaut/show-certificate-digest ... fix #1024 show cert fingerprints when adding new account w/ untrusted certificate	2015-11-06 11:23:30 +01:00
Andy Scherzinger	337b8f30a5	Fix visibility of file size and separator for folder see #1232	2015-11-04 10:04:03 +01:00
Andy Scherzinger	2cfc7237ea	correct text field names	2015-11-02 15:26:00 +01:00
Andy Scherzinger	8110be0155	fixed another typo	2015-11-02 12:32:15 +01:00
Andy Scherzinger	90097b107d	typos fixed	2015-11-02 12:22:49 +01:00
Andy Scherzinger	f72289f7bf	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-11-02 08:41:51 +01:00
David A. Velasco	58559b784b	Let server decide default permissions for new share	2015-10-30 16:56:40 +01:00
David A. Velasco	d89488ea01	Refactoring: a single method to request ShareActivity	2015-10-30 16:56:24 +01:00
David A. Velasco	f4ae62cc48	Simplified handling of life cycle in ShareActivity to grant nice operation ... while navigating and rotating	2015-10-30 16:56:23 +01:00
David A. Velasco	d4df65d7c7	Fixed NPE on list of shares in SearchShareesFragment; and some clean-up	2015-10-30 16:55:29 +01:00
David A. Velasco	f91241566a	Renamed SearchFragment to SearchShareesFragment	2015-10-30 16:55:27 +01:00
David A. Velasco	aa4f47cbe0	Fixed error messages related with network in ShareActivity	2015-10-30 16:54:36 +01:00
masensio	fc2ac6445d	Give ALL_PRIVILEGES when create a Share with User/Group	2015-10-30 16:54:34 +01:00
masensio	ed89b915ae	Remove commented code	2015-10-30 16:54:33 +01:00
masensio	7b0ec3d3a6	Fix share with user/group when displayname!=username	2015-10-30 16:54:13 +01:00
masensio	c5ba47d4f2	Avoid fullscreen searchview when editing	2015-10-30 16:53:08 +01:00
David A. Velasco	ba694cba7d	Removed check of NULL after code review	2015-10-30 16:52:53 +01:00
David A. Velasco	30aa3fdfd1	Fixed error messages for user using getLogMessage()	2015-10-30 16:52:11 +01:00
David A. Velasco	cc0fb41554	Show error messages from server when share-specific errors occur while sharing or unsharing	2015-10-30 16:52:09 +01:00
David A. Velasco	eb9890f32f	Adaption to refactoring of library from GetRemoteUsersOrGroupsOperation to GetRemoteShareesOperation	2015-10-30 16:51:54 +01:00
David A. Velasco	2670c2642a	Put focus in search field and show keyboard automatically	2015-10-30 16:50:50 +01:00
masensio	d1294ca584	Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group	2015-10-30 16:50:49 +01:00
masensio	adde411b6f	Remove toast with create_share info	2015-10-30 16:48:36 +01:00
masensio	e9c562aa8a	Polish landscape and turns	2015-10-30 16:48:35 +01:00
masensio	f65152c5fb	Refactor saveSharesInFolder in FileDataStorageManager. Set the Content Values using prepareInsertShares method	2015-10-30 16:48:32 +01:00
masensio	671fef617b	Show users/groups in Search Fragment list	2015-10-30 16:48:31 +01:00
masensio	fdcf0ebbc8	Fix saveSharesDB, duplicated rows	2015-10-30 16:47:33 +01:00
David A. Velasco	b811eefe95	Fixed build after rebasing	2015-10-30 16:47:30 +01:00
David A. Velasco	4d13b49631	Fixes from CR	2015-10-30 16:47:28 +01:00
David A. Velasco	9df957d548	Share the file with a user or group when selected on the list of suggestions	2015-10-30 16:47:27 +01:00
David A. Velasco	5e0f46cc2e	Added operation to create shares with a sharee, separated from operation to create shares via link	2015-10-30 16:46:54 +01:00
David A. Velasco	33a9d1f447	Get rid of dependency on Context in CreateShareOperation	2015-10-30 16:41:59 +01:00
masensio	e81bff7679	Extra commit to complement: Fill in Users/Groups List of a 'share with' from server data	2015-10-30 16:41:58 +01:00
masensio	c49cc06d3d	Get users/group from Server, to fill in 'Share with' list	2015-10-30 16:41:57 +01:00
masensio	fcdef568ea	Remove share_group_indicator string	2015-10-30 16:39:23 +01:00
masensio	ceffbc4aa8	Remove unshare with users/groups option from the menu	2015-10-30 16:39:21 +01:00
David A. Velasco	2d854bc5a9	Prevent that arbitrary text is queried instead of selecting a user / group of the suggestions list	2015-10-30 16:39:20 +01:00
masensio	9cdaddefa3	Use UnshareOperation instead an AsyncTask, for unshare with	2015-10-30 16:39:19 +01:00
masensio	a00b272903	Adapt UnshareLinkOperation to support also ShareType: USER or GROUP. UnshareLinkOperation --> UnshareOperation	2015-10-30 16:37:36 +01:00
David A. Velasco	043d2128ad	Removed option to refine suggestions in edit field	2015-10-30 16:37:35 +01:00
masensio	de93a66763	Change ShareActivity type, now it is a FileActivity	2015-10-30 16:37:33 +01:00
David A. Velasco	1fae1f1b7f	Removed redundant ArrayList creation	2015-10-30 16:34:48 +01:00
tobiasKaminsky	fc0dfecf1a	fixed travis bug	2015-10-30 16:32:57 +01:00
masensio	1bdd672295	Add unshare with users/groups, from Share wiht view	2015-10-30 16:31:10 +01:00
David A. Velasco	305536f8c2	Users and groups retrieved from server to fill search suggestions	2015-10-30 16:31:08 +01:00
masensio	e0813be81e	Clean code in ShareFileFragment	2015-10-30 16:28:42 +01:00
masensio	1fbc44b574	Add new string for share_groups_indicator	2015-10-30 16:28:41 +01:00
masensio	3de67c45e4	Animate unshare button	2015-10-30 16:28:39 +01:00
masensio	fff362d103	Add unshare with user option to share with view	2015-10-30 16:28:37 +01:00
masensio	55dc0da79a	Get shares from Database, fix in insert shares in DB	2015-10-30 16:28:36 +01:00
David A. Velasco	e3d509a451	Complete search widget to send search requests to parent activity	2015-10-30 16:28:35 +01:00
masensio	72987c296f	Get shares from Database (WIP)	2015-10-30 16:26:28 +01:00
masensio	20b0ec8977	Show users/groups in share with view, getting the data from the server	2015-10-30 16:26:26 +01:00
masensio	00a221ea8f	Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project	2015-10-30 16:25:54 +01:00
David A. Velasco	0db4fc9b17	Sync user and group shares into database	2015-10-30 16:25:52 +01:00
masensio	905b68b4ec	Show the 'search' layout in phone and tablet	2015-10-30 15:23:03 +01:00
David A. Velasco	bc5687b74a	Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)	2015-10-30 15:23:00 +01:00
masensio	263152a067	Add Get Groups operation	2015-10-30 15:22:57 +01:00
masensio	5a14928e1e	Add Get Users from Server Operation	2015-10-30 15:22:36 +01:00
masensio	f28faf0c26	Show the layout to hsare with user in phone and tablet	2015-10-30 15:21:48 +01:00
masensio	c288f91d87	Add new attribute to OCFile to know if this file is shared with users/groups	2015-10-30 15:21:45 +01:00
masensio	e50bc09321	Add new attribute to OCFile to know if this file is shared with users/groups	2015-10-30 15:10:41 +01:00
masensio	a94c176c75	Show share with users option if the server supports search users function	2015-10-30 15:08:14 +01:00
masensio	3a527a8fe4	Add 'Share with users/groups' to long press menu	2015-10-30 15:04:34 +01:00
Maria Asensio	eaa0612bfa	Merge pull request #1109 from owncloud/sync_full_folder ... Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder	2015-10-30 14:14:52 +01:00
Maria Asensio	4a11470630	Merge pull request #1200 from owncloud/fix_1192_date_time ... fix for #1192	2015-10-30 10:38:14 +01:00
LukeOwncloud	9d4ce6becd	MC: Updated comment only ... Comment did not reflect last commit change.	2015-10-29 21:03:32 +01:00
masensio	3444d61be8	Detect conflict when local and server version are changed	2015-10-29 17:13:24 +01:00
Andy Scherzinger	448124cc7e	return standard date string as fallback	2015-10-29 10:24:15 +01:00
masensio	bcfa07f565	Fix Select Local Version or Keep Both behaviour when solving file coflict	2015-10-27 14:32:42 +01:00
masensio	b9ef747a0b	Merge branch 'master' into sync_full_folder ... Conflicts: owncloud-android-library src/com/owncloud/android/files/services/FileUploader.java	2015-10-27 08:52:17 +01:00
Andy Scherzinger	5c1e6e59ba	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-22 13:05:06 +02:00
David A. Velasco	08443f90c5	Merge pull request #1177 from owncloud/notification_coloring ... Add ownCloud color to notifications for lollipop	2015-10-22 09:10:10 +02:00
tobiasKaminsky	e92297ccaf	split "on charging" to photo and video	2015-10-18 12:51:08 +02:00
tobiasKaminsky	e5caabd104	Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging	2015-10-18 12:50:54 +02:00
tobiasKaminsky	7fe9c02bff	Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging	2015-10-18 10:08:46 +02:00
Andy Scherzinger	e8eda963ae	flipped the if/else for performance optimization	2015-10-16 11:41:26 +02:00
Andy Scherzinger	be83702fd7	Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time	2015-10-16 10:42:02 +02:00
Andy Scherzinger	30720e98a5	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-16 10:41:32 +02:00
tobiasKaminsky	e18773465d	Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles	2015-10-15 18:27:07 +02:00
tobiasKaminsky	960ea3ceac	fixed missing refresh of thumbnail after sync	2015-10-15 16:20:14 +02:00
masensio	8e87cc2bf4	Merge remote-tracking branch 'origin/develop'	2015-10-15 16:17:32 +02:00
masensio	1f964a79dd	Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail ... Conflicts: src/com/owncloud/android/ui/fragment/FileDetailFragment.java	2015-10-15 16:10:55 +02:00
Andy Scherzinger	ae6194ffee	fix for #1192	2015-10-15 14:04:56 +02:00
Andy Scherzinger	5db8c47b8a	Merge branch 'master' of https://github.com/owncloud/android into notification_coloring	2015-10-09 14:45:32 +02:00
tobiasKaminsky	8b3ed70791	wip	2015-10-07 22:35:55 +02:00
tobiasKaminsky	25410ff36a	Merge branch 'master' of github.com:owncloud/android into cancelWlan	2015-10-07 22:31:37 +02:00
tobiasKaminsky	c0a3399573	on wifi change: cancel all pending uploads, check prior each upload	2015-10-07 21:34:39 +02:00
Andy Scherzinger	41a883549f	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-10-07 19:03:23 +02:00
Maria Asensio	567355eed0	Merge pull request #1190 from owncloud/1182_Open_With_Fix ... Fix for #1182 on Android 5	2015-10-07 11:19:16 +02:00
Maria Asensio	72e588b6b7	Merge pull request #1117 from owncloud/sortAccents ... Sort accents	2015-10-06 14:51:14 +02:00
Andy Scherzinger	75e2349e5b	Code review	2015-10-06 09:58:16 +02:00
Andy Scherzinger	8f0ea82efd	Fix for #1182 on Android 5	2015-10-05 18:44:50 +02:00
tobiasKaminsky	a48db2f8e3	show big thumbnails for videos	2015-10-05 07:53:10 +02:00
tobiasKaminsky	7579d3daf7	Merge remote-tracking branch 'remotes/upstream/master' into sortAccents	2015-10-02 16:04:18 +02:00
Wikinaut	cf063bf04a	fix #1024 show cert fingerprints when adding new account w/ untrusted cert ... + show SHA-256, SHA-1 and MD5 certificate fingerprint instead of signature hex dump when certificate is untrusted + show error string if one of the digest algorithms is not available + added check and error msg for certificate load problems	2015-10-02 02:39:10 +02:00
masensio	99d7e18916	Merge pull request #839 from fluffy88/develop ... Trigger media scan after file upload	2015-10-01 18:45:01 +02:00
masensio	08d02058c8	Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation	2015-09-30 17:59:12 +02:00
masensio	9494620cc4	Merge branch 'master' into sync_full_folder ... Conflicts: src/com/owncloud/android/providers/FileContentProvider.java	2015-09-30 12:24:01 +02:00
David A. Velasco	001801a39b	Upload operations end in conflict if overriding a version different than the last known	2015-09-28 11:21:33 +02:00
Andy Scherzinger	796b1bd297	Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background	2015-09-27 21:40:52 +02:00
Andy Scherzinger	35a68aa337	custom list preference implementation for visual material consistency on pre-lollipop	2015-09-27 20:21:09 +02:00
tobiasKaminsky	126d251375	fixed bug: behaviour is now obeyed for files that are uploaded after connection switch (no wlan to wlan)	2015-09-25 17:22:40 +02:00
Andy Scherzinger	5417b2a4e5	Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons	2015-09-25 16:09:01 +02:00
David A. Velasco	056b7c964d	Updated error message for failed folder synchronization ('download' not anymore)	2015-09-25 15:13:59 +02:00
David A. Velasco	7d7767aa11	Removed some logs	2015-09-25 15:13:57 +02:00
David A. Velasco	44023a6059	Clean-up: removed unused imports and methods, and commented code	2015-09-25 15:13:56 +02:00
David A. Velasco	499d628aa1	Removed separated 'download folder' in contextual menu and unused DownloadFolderOperation class	2015-09-25 15:13:54 +02:00
David A. Velasco	1e59a632bc	Fixed permanent 'uploading' icon on files that are automatically renamed during the upload	2015-09-25 15:13:53 +02:00
David A. Velasco	b8a3dc71e4	Safe blanket to clean DB if wrong conflicts keep stored	2015-09-25 15:13:51 +02:00
David A. Velasco	95bebe9382	Remove conflict badge from ancestors when conflict is solved there are no more conflicts below	2015-09-25 15:13:50 +02:00
David A. Velasco	7399508e05	Removed conflict badge when conflict is solved	2015-09-25 15:13:49 +02:00
David A. Velasco	a2aa0479fc	Added conflict icon to folders containing files with conflicts	2015-09-25 15:13:47 +02:00
David A. Velasco	e6c1454458	Persist conflicts in local database and show with an icon in the list of files	2015-09-25 15:13:46 +02:00
David A. Velasco	5f41bb14d3	ETag used to detect changes in remote files (not only in folders)	2015-09-25 15:13:44 +02:00
David A. Velasco	c0c52fa16a	Fixed NullPointerExceptionS in upload cancelations	2015-09-25 15:13:43 +02:00
David A. Velasco	9b5506f81e	Join cancelation of downloads and uploads in 'cancel sync', both for files and folders	2015-09-25 15:13:41 +02:00
David A. Velasco	68b52ddc5f	Rewritten queue of FileUploader based on IndexedForest	2015-09-25 15:13:40 +02:00
David A. Velasco	e885c78dc7	Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside	2015-09-25 15:13:38 +02:00
David A. Velasco	0162d2f9c9	Keep the old operation to sync folder as DownloadFolderOperation to allow its use while the new SyncFolderOperation gets stable	2015-09-25 15:13:37 +02:00
David A. Velasco	ac685690a2	Extend SyncFolderOperation to check local changes of all files and trigger uploads	2015-09-25 15:13:35 +02:00
masensio	9948180550	Merge pull request #1174 from owncloud/release_bug_fixes ... Fixed a couple of tiny bugs	2015-09-24 17:33:22 +02:00
David A. Velasco	0c8dfb6e8d	Close dangling Cursors in FileContentProvider	2015-09-24 17:06:54 +02:00
David A. Velasco	c7a29bc07b	Set default static values to prevent weird crash	2015-09-24 17:06:39 +02:00
David A. Velasco	c8c3e84268	Fix repetition of already finished access to root folder (AsyncTask) on rotation, in log-in view	2015-09-24 16:13:58 +02:00
Andy Scherzinger	de13ecc4e3	Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons	2015-09-24 09:46:58 +02:00
David A. Velasco	b7bb1ec0e9	Fixed crashed on cancelled download in gallery	2015-09-22 09:29:33 +02:00
David A. Velasco	cd165b7ce6	Grant that cancellations of tasks generating thumbnails really works for reused icon views	2015-09-21 21:25:11 +02:00
tobiasKaminsky	a0b061a058	java 1.5 does not support switch with strings :/	2015-09-21 09:57:00 +02:00
tobiasKaminsky	2b6a61ddae	#819 part3: When uploading from filesystem inside the owncloud app, show question	2015-09-21 09:45:20 +02:00
tobiasKaminsky	4b8a5a9c92	#819, part 2: Instant uploads, depends on setting	2015-09-19 14:33:29 +02:00
tobiasKaminsky	69bbb5c8cb	#819: sending files to owncloud from another app: only upload, no copy	2015-09-18 17:47:23 +02:00
Andy Scherzinger	044c597e2b	fix for refresh bug	2015-09-16 17:21:53 +02:00
masensio	359ede5fdd	Merge pull request #1149 from owncloud/new_filetype_icons ... New icon detection in general + support for additional mimetype icons	2015-09-16 11:39:26 +02:00
Andy Scherzinger	9e15d2459d	Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons	2015-09-15 18:44:49 +02:00
Andy Scherzinger	3ff4d6df0f	adapting web's way of choosing icons	2015-09-15 18:02:34 +02:00
Andy Scherzinger	6eccdc25b3	Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons ... Conflicts: src/com/owncloud/android/utils/DisplayUtils.java	2015-09-11 13:06:14 +02:00
Andy Scherzinger	13a73dd568	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-09-11 12:47:01 +02:00
Andy Scherzinger	b1aff42715	further cleanup, moving folder icon determination into util class	2015-09-11 11:15:55 +02:00
Andy Scherzinger	ed094a7df6	Add further javadoc descsribing how to maintain further mappings in the future	2015-09-11 10:57:11 +02:00
Andy Scherzinger	1a26995be2	remove commented out test code	2015-09-10 18:20:26 +02:00
Andy Scherzinger	97fc896fd4	added mapping for bin to be iconized with "application"	2015-09-10 18:16:35 +02:00
Andy Scherzinger	fa12c619b0	rewrite for icon determination with refactoring into its own class + fixed a typo	2015-09-10 17:55:26 +02:00
Andy Scherzinger	8c19d0fa50	shortened this prediction, since it will always be image...	2015-09-10 17:54:05 +02:00
Andy Scherzinger	e9f793755e	showing the filename in the long press menu on file list, see #559	2015-09-07 12:24:01 +02:00
Andy Scherzinger	6d670fb678	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-09-07 11:16:29 +02:00
David A. Velasco	3f40da0ac9	Fixed text preview filter to take into account local knowledge about MIME types	2015-09-07 09:14:00 +02:00
David A. Velasco	68ce6e62bf	Reverse filter for preview of text files: all text/ but those in black list	2015-09-04 15:01:25 +02:00
masensio	fc5c4d899c	Merge branch 'master' into text_file_preview_pr_707_with_develop ... Conflicts: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-09-04 14:31:10 +02:00
Andy Scherzinger	32145d57db	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/uploader_layout.xml	2015-09-04 13:16:11 +02:00
masensio	f787213cd1	Merge pull request #1102 from owncloud/copy ... Copy files	2015-09-04 11:14:42 +02:00
masensio	3b2c61a48c	Merge branch 'master' into uploadShowsFiles ... Conflicts: res/layout/uploader_layout.xml res/layout/uploader_list_item_layout.xml src/com/owncloud/android/ui/activity/Uploader.java	2015-09-02 16:45:33 +02:00
masensio	6b84d83b35	Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop	2015-09-02 13:29:14 +02:00
masensio	a0707428ff	Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop ... Conflicts: res/layout/file_preview.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java	2015-09-02 13:23:42 +02:00
David A. Velasco	f626b13634	Merge pull request #1114 from owncloud/tryFix1113 ... Removed squared background for transparencies from file type icons and thumbnails (stays for images in gallery view)	2015-09-02 11:00:30 +02:00
David A. Velasco	e6be60679f	Merge branch 'master' into copy ... Conflicts FIXED: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java src/com/owncloud/android/ui/preview/FileDownloadFragment.java src/com/owncloud/android/ui/preview/PreviewImageFragment.java src/com/owncloud/android/ui/preview/PreviewMediaFragment.java	2015-09-01 18:35:51 +02:00
masensio	efb3989ee6	Merge branch 'develop' into uploadWhenCharging ... Conflicts: res/values-fr/strings.xml res/xml/preferences.xml	2015-09-01 16:51:40 +02:00
masensio	313df93e95	Set background color as background for png with tranparency	2015-08-31 16:40:04 +02:00
Joas Schilling	03492691fc	Strip away index.php/apps/files to allow copy pasting from the server	2015-08-28 20:21:53 +02:00
masensio	ca2892bdf1	Remove transparent background in icons	2015-08-28 18:50:43 +02:00
tobiasKaminsky	d1c18cac12	removed commented code	2015-08-25 15:57:10 +02:00
tobiasKaminsky	54a4263eeb	fix #1110: accents not sorted	2015-08-25 15:55:45 +02:00
masensio	b81de1d547	Merge branch 'master' into create_folder_button_on_action_bar_for_uploader ... Conflicts: res/layout/uploader_layout.xml	2015-08-25 14:53:42 +02:00
tobiasKaminsky	69e78694cd	to be sure ;)	2015-08-25 14:43:36 +02:00
tobiasKaminsky	6df6548ee7	try fix #1113	2015-08-25 14:40:16 +02:00
masensio	8c9270e114	Merge pull request #1082 from owncloud/ignoreHiddenFiles ... ignore hidden files also if they are images for counting	2015-08-24 13:06:36 +02:00
masensio	e836fd66e4	Merge pull request #1078 from gstraube/develop ... Check if ETag for remote folder is null, i.e. it was not received from the server	2015-08-24 12:59:43 +02:00
tobiasKaminsky	84f9169e7a	Thumbnails add checkerboard to png	2015-08-22 07:49:35 +02:00
gstraube	1a8a655747	Merge remote-tracking branch 'upstream/develop' into develop	2015-08-21 20:45:40 +02:00
tobiasKaminsky	8e3787909f	Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground	2015-08-21 17:48:58 +02:00
Andy Scherzinger	fd39e9168b	replaced the icons and header coloring	2015-08-21 17:32:24 +02:00
masensio	5fb74888c8	Disable some parts in code for testing actions in uploads view	2015-08-21 14:04:31 +02:00
purigarcia	e9ca430fa0	Merge branch 'develop' into ignoreHiddenFiles	2015-08-21 11:18:17 +02:00
masensio	3e6bcda9a4	Merge branch 'develop' into reliable_uploads ... Conflicts: src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java src/com/owncloud/android/ui/activity/FileActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/activity/Uploader.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java	2015-08-20 16:37:10 +02:00
Andy Scherzinger	d24b396d54	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-20 13:50:44 +02:00
Andy Scherzinger	a46eb270ab	further m-prefixing	2015-08-20 13:46:27 +02:00
Andy Scherzinger	ee85bf9e8c	fixed m-Prefixing	2015-08-20 13:39:59 +02:00
Andy Scherzinger	8db8b07be0	NullCheck for drawer	2015-08-20 12:47:31 +02:00
Andy Scherzinger	6219397371	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-20 11:39:25 +02:00
Andy Scherzinger	8b55e8b35c	prefixed variables with 'm'	2015-08-20 11:35:40 +02:00
Jorge Antonio Diaz-Benito Soriano	ae0e116ffc	Fixes the text preview issue	2015-08-19 21:07:14 +02:00
Andy Scherzinger	d83ca06e51	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-19 19:18:00 +02:00
Andy Scherzinger	2ce3e2707a	NPE Fix for setting the color on the IndeterminateProgressDialog	2015-08-19 19:17:09 +02:00
Andy Scherzinger	7f13b98cc0	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout-land/account_setup.xml res/layout/account_setup.xml	2015-08-18 23:20:01 +02:00
Andy Scherzinger	cbb0f8743f	Fix for long click menue for account management in preferences screen	2015-08-18 23:13:10 +02:00
Andy Scherzinger	dbed65610b	fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle	2015-08-18 22:09:53 +02:00
Jorge Antonio Diaz-Benito Soriano	97da4d5c8a	Fixes the last reported bugs	2015-08-18 18:05:20 +02:00
Andy Scherzinger	da89715045	reverted back to light colored login	2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano	21c391c0b2	Removes a static modifier that sneaked in	2015-08-18 17:39:50 +02:00
Jorge Antonio Diaz-Benito Soriano	3b2f51b5a5	Refactored functionality to use the new FolderPickerActivity class	2015-08-18 17:36:08 +02:00
Jorge Antonio Diaz-Benito Soriano	4fc0ef5abb	Updated copy action	2015-08-18 17:20:56 +02:00
Jorge Antonio Diaz-Benito Soriano	ccf8741fab	Added copy action	2015-08-18 17:00:51 +02:00
Jorge Antonio Diaz-Benito Soriano	bc50129881	Fixed 'Move' action	2015-08-18 16:21:39 +02:00
Jorge Antonio Diaz-Benito Soriano	db40d1ad68	Added 'ACTION_COPY_FILES'.	2015-08-18 16:15:00 +02:00
Jorge Antonio Diaz-Benito Soriano	dcffd79b60	Tweaks for source 1.5	2015-08-18 15:55:00 +02:00
masensio	e5e5b3638c	Merge branch 'develop' into reliable_uploads ... Conflicts: SETUP.md owncloud-android-library res/menu/main_menu.xml res/values/strings.xml src/com/owncloud/android/db/DbHandler.java src/com/owncloud/android/db/ProviderMeta.java src/com/owncloud/android/files/FileMenuFilter.java src/com/owncloud/android/files/FileOperationsHelper.java src/com/owncloud/android/files/services/FileDownloader.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/operations/SynchronizeFileOperation.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/ComponentsGetter.java src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java src/com/owncloud/android/ui/activity/FileActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/activity/UploadFilesActivity.java src/com/owncloud/android/ui/activity/Uploader.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java src/com/owncloud/android/ui/preview/PreviewImageActivity.java	2015-08-18 15:14:37 +02:00
Andy Scherzinger	e79f92f566	Conflict Dialog Fix	2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano	fe5b6aa4a8	Added copy action	2015-08-18 13:35:28 +02:00
Andy Scherzinger	a393531774	visual fix for Progress DialogFragment(s)	2015-08-18 13:08:58 +02:00
Jorge Antonio Diaz-Benito Soriano	c7205b8f56	Added CopyActivity	2015-08-18 11:39:18 +02:00
Jorge Antonio Diaz-Benito Soriano	dc8ceffddc	Fixed 'Move' action	2015-08-18 11:37:23 +02:00
Jorge Antonio Diaz-Benito Soriano	d9db150a31	Added 'ACTION_COPY_FILES'.	2015-08-18 11:17:54 +02:00
Andy Scherzinger	b669bd7737	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-17 16:04:17 +02:00
Andy Scherzinger	4ff231f256	Java Doc added	2015-08-17 16:00:16 +02:00
Andy Scherzinger	ba80646e4e	Fix for 4.0 file action context menu (re-implement it via DialogFragment)	2015-08-17 15:58:03 +02:00
Andy Scherzinger	172767d391	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-14 19:34:08 +02:00
Andy Scherzinger	66bae3914c	read cover art for audio file (works for mp3) and displays it in the media player, sets the default logo (as before) in case it couldn't read and convert a cover art.	2015-08-14 19:33:23 +02:00
Andy Scherzinger	267179ef2e	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-14 18:55:58 +02:00
Andy Scherzinger	71f68b4c8c	fix for progressbars on pre lollipop and post ics for seekbar thumbs	2015-08-14 18:55:31 +02:00
Andy Scherzinger	92af92ee3b	merged part of the fixes from material buttons branch to fix bugs reported in PR #1076	2015-08-14 17:18:36 +02:00
tobiasKaminsky	c50aa8bc2a	Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail	2015-08-14 15:39:35 +02:00
Andy Scherzinger	abb6e2dbd5	Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices	2015-08-14 15:29:22 +02:00
Andy Scherzinger	607fb6f587	group change data and size together and calculate decimals based on total size see comment in PR #1090	2015-08-14 10:05:26 +02:00
tobiasKaminsky	be5dbcbb2e	fixed bug caused by rotating the device	2015-08-13 20:11:58 +02:00
Andy Scherzinger	414f43f326	fixed arrow coloring on the pull to refresh on the file list	2015-08-13 19:28:44 +02:00
Andy Scherzinger	1c7de5c7a5	coloring the progress wheel	2015-08-13 19:16:11 +02:00
Andy Scherzinger	455b349c08	moved everything to AppCompatActivity since ActionBarActivity is deprecated	2015-08-13 18:46:19 +02:00
Andy Scherzinger	bbd529289c	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-13 17:58:58 +02:00
Andy Scherzinger	bac0fa5f28	move from deprecated ActionBarActivity to AppCompatActivity	2015-08-13 17:54:33 +02:00
Andy Scherzinger	af2af7198b	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/ssl_untrusted_cert_layout.xml res/layout/ssl_validator_layout.xml	2015-08-13 15:57:38 +02:00
Andy Scherzinger	60e0f09278	Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons	2015-08-13 15:41:59 +02:00
Andy Scherzinger	05ca0270a8	fixed button style blue/grey	2015-08-12 18:54:27 +02:00
masensio	eda6f71491	Move create folder button to action bar in Uploader	2015-08-11 11:14:26 +02:00
Andy Scherzinger	a1b24dea37	Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail	2015-08-10 16:02:02 +02:00
Andy Scherzinger	456647c996	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons	2015-08-10 11:19:23 +02:00
David A. Velasco	64ebb2c1d3	Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view	2015-08-10 11:12:43 +02:00
Andy Scherzinger	0d75348b30	use custom checkbox images (material design) while toggling	2015-08-07 18:20:51 +02:00
Andy Scherzinger	ddd01569cd	Optimized translucence for lollipop on image preview	2015-08-06 19:14:52 +02:00
Andy Scherzinger	6b6227125b	added back translucent action bar for image preview	2015-08-06 19:04:22 +02:00
Andy Scherzinger	9d9efd1c1d	Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar ... Conflicts: owncloud-android-library	2015-08-06 17:23:02 +02:00
Andy Scherzinger	a257935b8c	Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency	2015-08-06 17:13:00 +02:00
Andy Scherzinger	1ce7d79ff0	Move alert dialog to material variant and setting the correct accent color for the button texts via styles	2015-08-06 16:27:56 +02:00
David A. Velasco	6a8034ec24	Added username to SAML credentials	2015-08-06 10:23:29 +02:00
purigarcia	91000ba405	change the subject	2015-08-06 10:23:27 +02:00
masensio	d1257b34c0	Fix problems in PreviewTextFragment related with changes in develop	2015-08-05 17:18:17 +02:00
masensio	b694fee63d	Merge commit 'refs/pr/707' into text_file_preview_pr_707_with ... Conflicts: src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-08-05 16:48:12 +02:00
Andy Scherzinger	f289998946	removed unused listener (would only be useful in case of using toolbar instead of actionbar)	2015-08-05 13:01:37 +02:00
Andy Scherzinger	3956a50855	fixed deprecated getDrawable call	2015-08-05 12:58:40 +02:00
Andy Scherzinger	7c9c4a4ca6	remove two-times init of the drawer	2015-08-05 12:54:31 +02:00
Andy Scherzinger	e36349f77e	fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment	2015-08-04 18:32:33 +02:00
David A. Velasco	3512eae861	Fixed double request for ConflictsResolveActivity	2015-08-04 16:47:46 +02:00
tobiasKaminsky	e1ab4a41aa	download file if "use server version"	2015-08-04 12:39:59 +02:00
tobiasKaminsky	1327ce7315	renamed string values	2015-08-04 12:39:56 +02:00
Andy Scherzinger	a51fcd31a7	Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar	2015-08-03 21:39:27 +02:00
Andy Scherzinger	6235022b56	Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar	2015-08-03 21:38:32 +02:00
tobiasKaminsky	f4f3ecf46d	fixed line break	2015-08-02 08:40:14 +02:00
tobiasKaminsky	8fab264a05	resized video overlay ... removed empty image parts	2015-08-02 08:33:07 +02:00
tobiasKaminsky	8b23c3a7a6	ignore hidden files also if they are images for counting	2015-08-02 08:19:28 +02:00
tobiasKaminsky	608febb1c6	wip	2015-07-31 18:40:49 +02:00
AndyScherzinger	5b6bde5efc	now works for initial opening and browsing down once	2015-07-31 17:22:19 +02:00
tobiasKaminsky	689199a0b5	wip	2015-07-30 21:38:13 +02:00
gstraube	aec910ff83	Check if ETag for remote folder is null, i.e. it was not received from the server	2015-07-28 22:05:54 +02:00
purigarcia	65fe0be763	merge develop	2015-07-28 10:47:08 +02:00
purigarcia	f068a156c5	merge develop	2015-07-28 10:46:13 +02:00
AndyScherzinger	bfea14e876	setting the username on the drawer header for startup and coming back from the preferences screen for account switching	2015-07-27 20:20:46 +02:00
AndyScherzinger	4b9190baea	npe fix for file upload on instance saving since actionbar in list mode doesn't habe a title	2015-07-27 00:25:34 +02:00
AndyScherzinger	77c5ce77b2	removed unused lagacy code	2015-07-26 19:40:53 +02:00
AndyScherzinger	e72caebbce	fine tuning icon work on login screen, making landscape visually en par with portrait mode	2015-07-26 18:36:00 +02:00
AndyScherzinger	49b3acd2be	added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore	2015-07-26 17:52:29 +02:00
AndyScherzinger	53bbdfb0e8	in case of open drawer close it onBackPressed	2015-07-26 02:25:25 +02:00
AndyScherzinger	d474239b21	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
tobiasKaminsky	e14533e387	overlay is added also when downloading new thumbnails	2015-07-24 18:29:24 +02:00
David A. Velasco	c21fa6c6e5	Merge pull request #1050 from owncloud/favourites_context_menu ... 'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files	2015-07-23 09:37:13 +02:00
tobiasKaminsky	37df675ca3	update	2015-07-22 21:00:09 +02:00
tobiasKaminsky	8c92889fa1	Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging	2015-07-22 20:15:14 +02:00
purigarcia	61e6191342	change the name of the method from keepInSync to favorite. Other changes commented in the review	2015-07-22 18:13:45 +02:00
David A. Velasco	ff82b51e49	Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList ... ShareWithMe icon in file list	2015-07-20 12:27:52 +02:00
purigarcia	f7211fe486	remove empty line	2015-07-20 12:20:15 +02:00
purigarcia	5cc79b0919	modify for the review	2015-07-20 12:18:44 +02:00
purigarcia	c7817b9302	modify code to be simpler	2015-07-20 10:57:53 +02:00
masaaki matsuo	a601a0e06e	Dispaly thumbnail when file is image	2015-07-17 01:03:49 +09:00
tobiasKaminsky	29156ff73b	add checker pattern for FileList	2015-07-11 09:31:35 +02:00
tobiasKaminsky	0527754c50	add checker background pattern for all png images.	2015-07-11 09:18:26 +02:00
purigarcia	6b82b98abf	remove a space	2015-07-10 08:49:35 +02:00
purigarcia	066324f60a	save the state before rotate	2015-07-09 16:40:29 +02:00
purigarcia	a09e473555	Remove code that should not be in this pr	2015-07-09 09:35:28 +02:00
purigarcia	569625c677	encode the path	2015-07-09 09:30:30 +02:00
purigarcia	a2ac8c19a3	shareByLink in folder in gridview is shown is shown	2015-07-08 18:18:51 +02:00
purigarcia	451513a35d	in gridview in the folder, icons are not shown	2015-07-08 18:14:38 +02:00
purigarcia	0e95ee3e67	shareWithMe is shown in the file list	2015-07-08 17:41:41 +02:00
purigarcia	31768aabce	update the menu in the preview of the video	2015-07-08 16:54:39 +02:00
purigarcia	c1d4106c71	refresh menu in the preview of an image	2015-07-08 14:40:07 +02:00
purigarcia	782713b391	add action finished in FileActivity	2015-07-08 13:33:14 +02:00
purigarcia	38186052e7	remove a log	2015-07-08 11:15:22 +02:00