1
0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00

482 Commits

Author SHA1 Message Date
David A. Velasco
04c522659e Updated version of Android Gradle plug in for Android Stuido 1.0+ 2015-01-19 10:55:06 +01:00
LukeOwncloud
4f52b875d1 added log message for ResultCode.FILE_NOT_FOUND 2014-12-12 14:39:22 +01:00
David A. Velasco
8261865ff2 Merge branch 'master' into develop 2014-12-03 11:20:06 +01:00
jabarros
7ff0bc0d83 Merge pull request #38 from owncloudChalmers/buildsystem/gradle_develop
Gradle building system
2014-11-28 08:37:05 +01:00
Marcello Steiner
7fe3a83b5a Added the missing character in the .travis.yml 2014-11-26 18:44:54 +01:00
Jorge Antonio Diaz-Benito Soriano
9732d61d38 Restore .gitignore, remove files that were added 2014-11-25 21:32:32 +01:00
David A. Velasco
0030d82ee8 Merge pull request #46 from owncloud/instant_uploads_set_path
Buf fixes: released some stale connections
oc-android-library-0.9.4
2014-11-25 14:08:20 +01:00
David A. Velasco
07daf8c58c Grant that connections are released per level when a folder with depth > MAX_CONNECTIONS is created with all its ancestors 2014-11-24 14:13:18 +01:00
Jorge Antonio Diaz-Benito Soriano
005dd85fdc Update .gitignore and readded missing files 2014-11-24 12:02:35 +01:00
jabarros
c8a882761f Fix. If the path does not exist is not created when it hast to create more than 4 folders 2014-11-24 10:53:05 +01:00
Marcello Steiner
ef768b7d1b Merge branch 'develop' of github.com:owncloud/android-library into buildsystem/gradle_develop
Conflicts:
	.travis.yml
2014-11-21 13:22:46 +01:00
Marcello Steiner
04299bdf3c Added gradle support to the owncloud-android-library 2014-11-21 13:20:05 +01:00
jabarros
2799b3e853 Merge pull request #43 from owncloud/tls_v1.1_and_v1.2_support
TLS v1.1 and v1.2 support, plus test project refactored to use "same" socket factory as library
2014-11-17 15:12:42 +01:00
David A. Velasco
a5a2b2890f Let the setup() - testXXX() - tearDown() flow normally 2014-11-17 12:34:17 +01:00
David A. Velasco
fcf3bd2769 Clean-up at NetworkUtils.java 2014-11-17 10:47:37 +01:00
David A. Velasco
93e08bc215 Grant that all supported secure protocol is enabled, but no unsupported protocol is tried to be enabled 2014-11-17 10:41:35 +01:00
David A. Velasco
9881150410 Grant that a security provider supporting TLSv1.2 is requested 2014-11-17 09:56:54 +01:00
David A. Velasco
5ce6e92b53 Enabling secure protocols in a single method 2014-11-17 09:40:47 +01:00
David A. Velasco
950a3ff8f7 Apply protocol enabling to extra createSocket method after merging fix on tunneled HTTP 2014-11-14 14:59:05 +01:00
David A. Velasco
d66d5047b4 Move build_number resource to the right context 2014-11-12 19:14:07 +01:00
David A. Velasco
57173b175c REALLY use Travis build number to avoid parallel tests interfere each other 2014-11-12 18:18:04 +01:00
David A. Velasco
1f27c0f318 Ignore timeouts in setups() and teardowns() to work around response time of test server 2014-11-12 14:28:21 +01:00
David A. Velasco
0149ee813d Use Travis build number to avoid parallel tests interfere each other 2014-11-12 14:18:22 +01:00
David A. Velasco
c1564e8c38 Avoid remove in teardown of testUploadFileNotFound 2014-11-11 14:19:37 +01:00
David A. Velasco
5f11b3d998 Refactored test project to work correctly with AdvancedSslSocketFactory as base to create sockets 2014-11-11 13:37:30 +01:00
David A. Velasco
5a67c8b4fe Merge remote-tracking branch 'tknoelle/develop' into tls_v1.1_and_v1.2_support 2014-11-11 13:34:50 +01:00
Thorsten Knöller
539ea8f71a TLSv1.1 and TLSv1.2 fix 2014-10-30 17:55:22 +01:00
jabarros
4f315c7e06 Merge pull request #40 from owncloud/fix_https_access_via_proxy
Fix access to HTTPS servers via proxy
2014-10-30 14:24:23 +01:00
jabarros
2289015b77 Minor change in order to enforce Travis to be launched 2014-10-30 14:08:08 +01:00
David A. Velasco
2199a16064 Line wrap at 120 characters 2014-10-28 12:34:02 +01:00
David A. Velasco
a17dfaed4d AdvancedSslSocketFactory needs to implement SecureProtocolSocketFactory so that the connection manager tunnel correctly through the proxy 2014-10-28 12:31:23 +01:00
jabarros
5bd0d73877 Merge branch 'master' into develop 2014-10-20 14:44:34 +02:00
jabarros
d709798359 Merge branch 'release-1.6.0' oc-android-library-0.9.3 2014-10-20 13:02:35 +02:00
jabarros
8764ac8f63 Update travis.yml file for building with new Android support in Travis 2014-10-20 11:24:12 +02:00
jabarros
67c41d8ec3 Check Travis update 2014-10-20 10:42:26 +02:00
LukeOwncloud
6491ae18c3 Update pom.xml
update android sdk 19 to revision 4
2014-10-12 21:32:01 +02:00
LukeOwncloud
70bcb55f27 Update pom.xml
update android sdk 19 to revision 4
2014-10-12 21:30:39 +02:00
jabarros
d2d782ccbd Merge pull request #39 from owncloud/load_proxy_settings_from_system
Proxy settings read from System and loaded in host configuration
2014-10-10 10:33:08 +02:00
jabarros
3d8162d6d7 Increase SYN_READ_TIMEOUT in ReadRemoteFileOperation until 40000 milliseconds 2014-10-01 12:44:02 +02:00
David A. Velasco
c29631b8bf Proxy settings read from System and loaded in host configuration 2014-09-22 12:23:30 +02:00
David A. Velasco
ff0de72ea5 Merge pull request #37 from owncloud/better_loggin_system
Specific OC logging integrated in android-library
2014-09-17 09:38:06 +02:00
jabarros
b7508d8462 Fixed error in logs in AdvancedSslSockectFactory class after CR 2014-09-17 09:24:54 +02:00
David A. Velasco
79d586637e Merge branch 'move_files_and_folders' into develop 2014-09-12 13:37:36 +02:00
jabarros
0924277662 Update logger for not start logging each time it is something appended 2014-09-12 13:33:07 +02:00
David A. Velasco
022c3befea Merge branch 'master' into develop 2014-09-12 13:07:43 +02:00
LukeOwncloud
79dfca74a5 Update pom.xml 2014-09-12 12:29:05 +02:00
jabarros
cb7b547cd7 Create method for making available the change of the log folder 2014-09-12 11:22:46 +02:00
jabarros
b0fe841c3e Add Log_OC class and update the log references 2014-09-12 09:30:54 +02:00
David A. Velasco
5d146c9236 Some improvementes in tests on failed move operations 2014-09-04 13:53:58 +02:00
David A. Velasco
df84917376 Redirect 'destination' header in custom redirections 2014-09-03 11:42:23 +02:00