projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored remove file operation (inherits RemoteOperation, so generates RemoteOperat...
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
operations
/
RemoteOperationResult.java
diff --git
a/src/com/owncloud/android/operations/RemoteOperationResult.java
b/src/com/owncloud/android/operations/RemoteOperationResult.java
index
d1d39f6
..
60b2b1a
100644
(file)
--- a/
src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/
src/com/owncloud/android/operations/RemoteOperationResult.java
@@
-206,11
+206,14
@@
public class RemoteOperationResult implements Serializable {
} else if (mException instanceof UnknownHostException) {
return "Unknown host exception";
} else if (mException instanceof UnknownHostException) {
return "Unknown host exception";
- } else if (mException instanceof
SSL
Exception) {
- if (
mCode == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED
)
+ } else if (mException instanceof
CertificateCombined
Exception) {
+ if (
((CertificateCombinedException) mException).isRecoverable()
)
return "SSL recoverable exception";
else
return "SSL exception";
return "SSL recoverable exception";
else
return "SSL exception";
+
+ } else if (mException instanceof SSLException) {
+ return "SSL exception";
} else if (mException instanceof DavException) {
return "Unexpected WebDAV exception";
} else if (mException instanceof DavException) {
return "Unexpected WebDAV exception";