5039 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
jabarros	5f1e5fdf59	Changes after CR	2016-05-24 12:53:41 +02:00
jabarros	ddd5152a11	Fix error after doing rebase	2016-05-24 12:53:41 +02:00
jabarros	365fe2845b	Added ui automator test case	2016-05-24 12:53:41 +02:00
jabarros	9a422887e7	First UI Automator example test	2016-05-24 12:53:41 +02:00
jabarros	c0c2133222	Added AndroidManifest with api level 18 for UI Automator tests	2016-05-24 12:53:41 +02:00
jabarros	cb630e5709	Setup Espresso environment	2016-05-24 12:53:41 +02:00
David A. Velasco	8ef1ade039	Disable UI tests in Travis until we get a stable setup	2016-05-24 12:53:41 +02:00
David A. Velasco	2dfd98cbdd	Turn on device screen before Espress tests start	2016-05-24 12:53:41 +02:00
David A. Velasco	7a6335430d	Normalized environment variables for end2end tests	2016-05-24 12:53:41 +02:00
jabarros	d94ea80d31	Modify travis file to execute AndroidTest	2016-05-24 12:53:41 +02:00
jabarros	014547fca3	Modify gradle to get env vars to be passed to android tests directly	2016-05-24 12:53:41 +02:00
jabarros	822a62c513	Pass test vars as instrumentation runner argumments	2016-05-24 12:53:41 +02:00
jrecio	7beb1325f6	fix throwing exceptions	2016-05-24 12:53:41 +02:00
jrecio	5293d1bfa1	fix wording in code	2016-05-24 12:53:41 +02:00
jrecio	ec8174318d	fix again	2016-05-24 12:53:41 +02:00
jrecio	b6c412bd2e	fix again	2016-05-24 12:53:41 +02:00
jrecio	be94b5663c	fix conflicts	2016-05-24 12:53:41 +02:00
jrecio	dde82c75c6	fix changes rebase	2016-05-24 12:53:41 +02:00
jabarros	a76bb109bc	Setup Espresso environment	2016-05-24 12:53:41 +02:00
David A. Velasco	950dbe2013	Increased verbosity of logs for local unit tests	2016-05-24 12:53:41 +02:00
David A. Velasco	bfccfa0dac	Comment out WIP Espress test	2016-05-24 12:53:41 +02:00
David A. Velasco	2cfcb2318c	Run sample instrumented unit test in Travis	2016-05-24 12:53:41 +02:00
David A. Velasco	b826c80cb8	Added first instrumented unit test	2016-05-24 12:53:41 +02:00
jabarros	bfbf3704de	Encrypt connection parameters in AndroidTest and launch tests from travis (WIP)	2016-05-24 12:53:41 +02:00
jabarros	db88f7f1dd	Initial text to check authentication (WIP)	2016-05-24 12:53:41 +02:00
jabarros	1fcd724d43	Setup Espresso environment	2016-05-24 12:53:41 +02:00
David A. Velasco	0a83e60d9b	Run local unit tests in Travis	2016-05-24 12:53:41 +02:00
David A. Velasco	a716dff066	Added sample local unit test	2016-05-24 12:53:41 +02:00
David A. Velasco	964560da8f	Added dependencies for local unit tests to app build.gradle file	2016-05-24 12:53:41 +02:00
David A. Velasco	c1f616ce54	Updated build.gradle to find local unit tests	2016-05-24 12:53:41 +02:00
David A. Velasco	3cf03eceaf	Merge pull request #1643 from owncloud/uploads_from_content_uris ... Fixed uploads from other apps	2016-05-23 13:10:22 +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