flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Jorge Antonio Diaz-Benito Soriano 2014-11-04 16:08:24 +01:00 committed by David A. Velasco
parent 2970b54e7c
commit ed720d0a65
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java
View File

@ -203,6 +203,21 @@ public class CopyFileTest extends ActivityInstrumentationTestCase2<TestActivity>
public CopyFileTest() { public CopyFileTest() {
super(TestActivity.class); super(TestActivity.class);
Protocol pr = Protocol.getProtocol("https");
if (pr == null || !(pr.getSocketFactory() instanceof SelfSignedConfidentSslSocketFactory)) {
try {
ProtocolSocketFactory psf = new SelfSignedConfidentSslSocketFactory();
Protocol.registerProtocol(
"https",
new Protocol("https", psf, 443));
} catch (GeneralSecurityException e) {
throw new AssertionFailedError(
"Self-signed confident SSL context could not be loaded");
}
}
} }
@ -428,13 +443,12 @@ public class CopyFileTest extends ActivityInstrumentationTestCase2<TestActivity>
mPass = context.getString(R.string.password); mPass = context.getString(R.string.password);
mClient = new OwnCloudClient( mClient = new OwnCloudClient(
Uri.parse("http://" + mServerUri), Uri.parse(mServerUri),
NetworkUtils.getMultiThreadedConnManager() NetworkUtils.getMultiThreadedConnManager()
); );
mClient.setDefaultTimeouts( mClient.setDefaultTimeouts(
OwnCloudClientFactory.DEFAULT_DATA_TIMEOUT, OwnCloudClientFactory.DEFAULT_DATA_TIMEOUT,
OwnCloudClientFactory.DEFAULT_CONNECTION_TIMEOUT); OwnCloudClientFactory.DEFAULT_CONNECTION_TIMEOUT);
mClient.setBaseUri(Uri.parse("http://" + mServerUri));
mClient.setFollowRedirects(true); mClient.setFollowRedirects(true);
mClient.setCredentials( mClient.setCredentials(
OwnCloudCredentialsFactory.newBasicCredentials( OwnCloudCredentialsFactory.newBasicCredentials(