mirror of
https://github.com/owncloud/android-library.git
synced 2025-06-08 00:16:09 +00:00
Clean up after CR
This commit is contained in:
parent
0e5cf18d8c
commit
11363adedb
@ -229,9 +229,9 @@ public class AdvancedSslSocketFactory implements SecureProtocolSocketFactory {
|
||||
|
||||
/**
|
||||
* Verifies the identity of the server.
|
||||
* <p>
|
||||
*
|
||||
* The server certificate is verified first.
|
||||
* <p>
|
||||
*
|
||||
* Then, the host name is compared with the content of the server certificate using the current host name verifier,
|
||||
* if any.
|
||||
*
|
||||
@ -325,10 +325,10 @@ public class AdvancedSslSocketFactory implements SecureProtocolSocketFactory {
|
||||
|
||||
/**
|
||||
* Grants that all protocols supported by the Security Provider in mSslContext are enabled in socket.
|
||||
* <p>
|
||||
*
|
||||
* Grants also that no unsupported protocol is tried to be enabled. That would trigger an exception, breaking
|
||||
* the connection process although some protocols are supported.
|
||||
* <p>
|
||||
*
|
||||
* This is not cosmetic: not all the supported protocols are enabled by default. Too see an overview of
|
||||
* supported and enabled protocols in the stock Security Provider in Android see the tables in
|
||||
* http://developer.android.com/reference/javax/net/ssl/SSLSocket.html.
|
||||
|
@ -166,14 +166,10 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
|
||||
} else if (status != FORBIDDEN_ERROR && status != SERVICE_UNAVAILABLE_ERROR) {
|
||||
client.exhaustResponse(mGet.getResponseBodyAsStream());
|
||||
|
||||
} // else, body read by RemoteOeprationResult constructor
|
||||
} // else, body read by RemoteOperationResult constructor
|
||||
|
||||
result = new RemoteOperationResult(isSuccess(status), mGet);
|
||||
|
||||
/*} catch (Exception e) {
|
||||
client.exhaustResponse(mGet.getResponseBodyAsStream());
|
||||
throw e;*/
|
||||
|
||||
} finally {
|
||||
if (fos != null) fos.close();
|
||||
if (bis != null) bis.close();
|
||||
|
Loading…
x
Reference in New Issue
Block a user