flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-17 19:32:56 +00:00
Code Issues Releases Wiki Activity

Update sample client to use new library

Browse Source
This commit is contained in:
davigonz
2018-10-02 10:53:52 +02:00
parent 096d037f94
commit 33fd1037a3
15 changed files with 158 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
-8
View File
@@ -45,12 +45,6 @@ import java.io.IOException;
public class OwnCloudClientFactory {
final private static String TAG = OwnCloudClientFactory.class.getSimpleName();
/** Default timeout for waiting data from the server */
public static final int DEFAULT_DATA_TIMEOUT = 60000;
/** Default timeout for establishing a connection */
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
/**
* Creates a OwnCloudClient setup for an ownCloud account
@@ -157,8 +151,6 @@ public class OwnCloudClientFactory {
boolean followRedirects) {
OwnCloudClient client = new OwnCloudClient(uri);
client.setDefaultTimeouts(DEFAULT_DATA_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT);
client.setFollowRedirects(followRedirects);
client.setContext(context);
src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java
+1 -2
View File
@@ -100,5 +100,4 @@ public class OwnCloudClientManagerFactory {
}
return false;
}
}
}
src/com/owncloud/android/lib/common/http/HttpClient.java
+3 -17
View File
@@ -102,6 +102,9 @@ public class HttpClient {
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
.addInterceptor(getOkHttpInterceptor())
.protocols(Arrays.asList(Protocol.HTTP_1_1))
.readTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
.writeTimeout(HttpConstants.DEFAULT_DATA_TIMEOUT, TimeUnit.MILLISECONDS)
.connectTimeout(HttpConstants.DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
.followRedirects(false)
.sslSocketFactory(sslContext.getSocketFactory(), trustManager)
.hostnameVerifier((asdf, usdf) -> true)
@@ -126,23 +129,6 @@ public class HttpClient {
return sOkHttpInterceptor;
}
/**
* Sets the connection and wait-for-data timeouts to be applied by default to the methods
* performed by this client.
*/
public void setDefaultTimeouts(int defaultDataTimeout, int defaultConnectionTimeout) {
OkHttpClient.Builder clientBuilder = getOkHttpClient().newBuilder();
if (defaultDataTimeout >= 0) {
clientBuilder
.readTimeout(defaultDataTimeout, TimeUnit.MILLISECONDS)
.writeTimeout(defaultDataTimeout, TimeUnit.MILLISECONDS);
}
if (defaultConnectionTimeout >= 0) {
clientBuilder.connectTimeout(defaultConnectionTimeout, TimeUnit.MILLISECONDS);
}
sOkHttpClient = clientBuilder.build();
}
public void disableAutomaticCookiesHandling() {
OkHttpClient.Builder clientBuilder = getOkHttpClient().newBuilder();
clientBuilder.cookieJar(new CookieJar() {
src/com/owncloud/android/lib/common/http/HttpConstants.java
+10
View File
@@ -174,4 +174,14 @@ public class HttpConstants {
public static final int HTTP_HTTP_VERSION_NOT_SUPPORTED = 505;
// 507 Insufficient Storage (WebDAV - RFC 2518)
public static final int HTTP_INSUFFICIENT_STORAGE = 507;
/***********************************************************************************************************
*************************************************** TIMEOUTS **********************************************
***********************************************************************************************************/
/** Default timeout for waiting data from the server */
public static final int DEFAULT_DATA_TIMEOUT = 60000;
/** Default timeout for establishing a connection */
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
}