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

Apply changes after CR

Browse Source
This commit is contained in:
David A. Velasco 2016-12-20 12:17:05 +01:00
parent 4c27395609
commit d7561264b5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/owncloud/android/lib/common/OwnCloudClient.java
View File

@ -115,7 +115,7 @@ public class OwnCloudClient extends HttpClient {
proxyPort = Integer.parseInt(proxyPortSt); proxyPort = Integer.parseInt(proxyPortSt);
} }
} catch (Exception e) { } catch (Exception e) {
// nothing to do here Log_OC.w(TAG, "Proxy port could not be read, keeping default value " + proxyPort);
} }
if (proxyHost != null && proxyHost.length() > 0) { if (proxyHost != null && proxyHost.length() > 0) {
@ -166,11 +166,11 @@ public class OwnCloudClient extends HttpClient {
/** /**
* Requests the received method with the received timeout (milliseconds). * Requests the received method with the received timeout (milliseconds).
* <p> *
* Executes the method through the inherited HttpClient.executedMethod(method). * Executes the method through the inherited HttpClient.executedMethod(method).
* <p> *
* Sets the socket and connection timeouts only for the method received. * Sets the socket and connection timeouts only for the method received.
* <p> *
* The timeouts are both in milliseconds; 0 means 'infinite'; * The timeouts are both in milliseconds; 0 means 'infinite';
* < 0 means 'do not change the default' * < 0 means 'do not change the default'
* *
@ -200,7 +200,7 @@ public class OwnCloudClient extends HttpClient {
/** /**
* Requests the received method. * Requests the received method.
* <p> *
* Executes the method through the inherited HttpClient.executedMethod(method). * Executes the method through the inherited HttpClient.executedMethod(method).
* *
* @param method HTTP method request. * @param method HTTP method request.
@ -361,7 +361,7 @@ public class OwnCloudClient extends HttpClient {
/** /**
* Sets the root URI to the ownCloud server. * Sets the root URI to the ownCloud server.
* <p> *
* Use with care. * Use with care.
* *
* @param uri * @param uri