Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable-2.19] Add sc_locked status #1513

Merged
merged 3 commits into from
Aug 9, 2024
Merged

[stable-2.19] Add sc_locked status #1513

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b972642
add sc_locked status
alperozturk96 May 3, 2024
d2cd375
update dependency verification
alperozturk96 Aug 9, 2024
fabfc70
update dependency verification
alperozturk96 Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 70 additions & 60 deletions library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public enum ResultCode {
LOCAL_STORAGE_NOT_REMOVED,
FORBIDDEN,
SHARE_FORBIDDEN,
OK_REDIRECT_TO_NON_SECURE_CONNECTION,
OK_REDIRECT_TO_NON_SECURE_CONNECTION,
INVALID_MOVE_INTO_DESCENDANT,
INVALID_COPY_INTO_DESCENDANT,
PARTIAL_MOVE_DONE,
Expand All @@ -129,7 +129,8 @@ public enum ResultCode {
ETAG_UNCHANGED,
VIRUS_DETECTED,
FOLDER_ALREADY_EXISTS,
CANNOT_CREATE_FILE
CANNOT_CREATE_FILE,
LOCKED
}

private boolean mSuccess = false;
Expand All @@ -155,8 +156,8 @@ public enum ResultCode {
public RemoteOperationResult(ResultCode code) {
mCode = code;
mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL || code == ResultCode.OK_NO_SSL ||
code == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION || code == ResultCode.ETAG_CHANGED ||
code == ResultCode.ETAG_UNCHANGED);
code == ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION || code == ResultCode.ETAG_CHANGED ||
code == ResultCode.ETAG_UNCHANGED);
mData = null;
}

Expand All @@ -169,30 +170,33 @@ private RemoteOperationResult(boolean success, int httpCode) {

} else if (httpCode > 0) {
switch (httpCode) {
case HttpStatus.SC_UNAUTHORIZED:
mCode = ResultCode.UNAUTHORIZED;
break;
case HttpStatus.SC_NOT_FOUND:
mCode = ResultCode.FILE_NOT_FOUND;
break;
case HttpStatus.SC_INTERNAL_SERVER_ERROR:
mCode = ResultCode.INSTANCE_NOT_CONFIGURED;
break;
case HttpStatus.SC_CONFLICT:
mCode = ResultCode.CONFLICT;
break;
case HttpStatus.SC_INSUFFICIENT_STORAGE:
mCode = ResultCode.QUOTA_EXCEEDED;
break;
case HttpStatus.SC_FORBIDDEN:
mCode = ResultCode.FORBIDDEN;
break;
case HttpStatus.SC_SERVICE_UNAVAILABLE:
mCode = ResultCode.MAINTENANCE_MODE;
break;
default:
mCode = ResultCode.UNHANDLED_HTTP_CODE;
Log_OC.d(TAG, "RemoteOperationResult has processed UNHANDLED_HTTP_CODE: " + httpCode);
case HttpStatus.SC_UNAUTHORIZED:
mCode = ResultCode.UNAUTHORIZED;
break;
case HttpStatus.SC_NOT_FOUND:
mCode = ResultCode.FILE_NOT_FOUND;
break;
case HttpStatus.SC_INTERNAL_SERVER_ERROR:
mCode = ResultCode.INSTANCE_NOT_CONFIGURED;
break;
case HttpStatus.SC_CONFLICT:
mCode = ResultCode.CONFLICT;
break;
case HttpStatus.SC_INSUFFICIENT_STORAGE:
mCode = ResultCode.QUOTA_EXCEEDED;
break;
case HttpStatus.SC_FORBIDDEN:
mCode = ResultCode.FORBIDDEN;
break;
case HttpStatus.SC_SERVICE_UNAVAILABLE:
mCode = ResultCode.MAINTENANCE_MODE;
break;
case HttpStatus.SC_LOCKED:
mCode = ResultCode.LOCKED;
break;
default:
mCode = ResultCode.UNHANDLED_HTTP_CODE;
Log_OC.d(TAG, "RemoteOperationResult has processed UNHANDLED_HTTP_CODE: " + httpCode);
}
}
}
Expand Down Expand Up @@ -244,9 +248,9 @@ public RemoteOperationResult(boolean success, String bodyResponse, int httpCode)

/**
* Public constructor from exception.
*
* <p>
* To be used when an exception prevented the end of the {@link RemoteOperation}.
*
* <p>
* Determines a {@link ResultCode} depending on the type of the exception.
*
* @param e Exception that interrupted the {@link RemoteOperation}
Expand Down Expand Up @@ -306,9 +310,9 @@ public RemoteOperationResult(boolean success, OkHttpMethodBase httpMethod) {

/**
* Public constructor from separate elements of an HTTP or DAV response.
*
* <p>
* To be used when the result needs to be interpreted from the response of an HTTP/DAV method.
*
* <p>
* Determines a {@link ResultCode} from the already executed method received as a parameter. Generally,
* will depend on the HTTP code and HTTP response headers received. In some cases will inspect also the
* response body.
Expand Down Expand Up @@ -346,13 +350,13 @@ public RemoteOperationResult(boolean success, HttpMethod httpMethod) {

/**
* Public constructor from separate elements of an HTTP or DAV response.
*
* <p>
* To be used when the result needs to be interpreted from HTTP response elements that could come from
* different requests (WARNING: black magic, try to avoid).
*
* <p>
* If all the fields come from the same HTTP/DAV response, {@link #RemoteOperationResult(boolean, HttpMethod)}
* should be used instead.
*
* <p>
* Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
*
* @param success The operation was considered successful or not.
Expand Down Expand Up @@ -380,13 +384,13 @@ public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, H

/**
* Public constructor from separate elements of an HTTP or DAV response.
*
* <p>
* To be used when the result needs to be interpreted from HTTP response elements that could come from
* different requests (WARNING: black magic, try to avoid).
*
* <p>
* If all the fields come from the same HTTP/DAV response, {@link #RemoteOperationResult(boolean, HttpMethod)}
* should be used instead.
*
* <p>
* Determines a {@link ResultCode} depending on the HTTP code and HTTP response headers received.
*
* @param success The operation was considered successful or not.
Expand Down Expand Up @@ -417,7 +421,7 @@ public RemoteOperationResult(boolean success,

/**
* Private constructor for results built interpreting a HTTP or DAV response.
*
* <p>
* Determines a {@link ResultCode} depending of the type of the exception.
*
* @param success Operation was successful or not.
Expand Down Expand Up @@ -446,6 +450,9 @@ private RemoteOperationResult(boolean success, int httpCode, String httpPhrase)
case HttpStatus.SC_CONFLICT: // 409
mCode = ResultCode.CONFLICT;
break;
case HttpStatus.SC_LOCKED: // 423
mCode = ResultCode.LOCKED;
break;
case HttpStatus.SC_INTERNAL_SERVER_ERROR: // 500
mCode = ResultCode.INSTANCE_NOT_CONFIGURED; // assuming too much...
break;
Expand All @@ -458,8 +465,8 @@ private RemoteOperationResult(boolean success, int httpCode, String httpPhrase)
default:
mCode = ResultCode.UNHANDLED_HTTP_CODE; // UNKNOWN ERROR
Log_OC.d(TAG,
"RemoteOperationResult has processed UNHANDLED_HTTP_CODE: "
+ mHttpCode + " " + mHttpPhrase);
"RemoteOperationResult has processed UNHANDLED_HTTP_CODE: "
+ mHttpCode + " " + mHttpPhrase);
}
}
}
Expand Down Expand Up @@ -559,7 +566,7 @@ private CertificateCombinedException getCertificateCombinedException(Exception e
Throwable cause = mException.getCause();
Throwable previousCause = null;
while (cause != null && cause != previousCause &&
!(cause instanceof CertificateCombinedException)) {
!(cause instanceof CertificateCombinedException)) {
previousCause = cause;
cause = cause.getCause();
}
Expand Down Expand Up @@ -610,10 +617,10 @@ public String getLogMessage() {

} else if (mException instanceof AccountNotFoundException) {
Account failedAccount =
((AccountNotFoundException)mException).getFailedAccount();
((AccountNotFoundException) mException).getFailedAccount();
return mException.getMessage() + " (" +
(failedAccount != null ? failedAccount.name : "NULL") + ")";
(failedAccount != null ? failedAccount.name : "NULL") + ")";

} else if (mException instanceof AccountsException) {
return "Exception while using account";

Expand Down Expand Up @@ -647,17 +654,19 @@ public String getLogMessage() {
return "Authenticated with a different account than the one updating";

} else if (mCode == ResultCode.INVALID_CHARACTER_IN_NAME) {
return "The file name contains an forbidden character";
return "The file name contains an forbidden character";

} else if (mCode == ResultCode.FILE_NOT_FOUND) {
return "Local file does not exist";
return "Local file does not exist";

} else if (mCode == ResultCode.SYNC_CONFLICT) {
} else if (mCode == ResultCode.SYNC_CONFLICT) {
return "Synchronization conflict";
} else if (mCode == ResultCode.LOCKED) {
return "File is currently locked by another user or process";
}

return "Operation finished with HTTP status code " + mHttpCode + " (" +
(isSuccess() ? "success" : "fail") + ")";
(isSuccess() ? "success" : "fail") + ")";

}

Expand All @@ -679,8 +688,8 @@ public String getRedirectedLocation() {

public final boolean isIdPRedirection() {
return (mRedirectedLocation != null &&
(mRedirectedLocation.toUpperCase(Locale.US).contains("SAML") ||
mRedirectedLocation.toLowerCase(Locale.US).contains("wayf")));
(mRedirectedLocation.toUpperCase(Locale.US).contains("SAML") ||
mRedirectedLocation.toLowerCase(Locale.US).contains("wayf")));
}

/**
Expand All @@ -703,13 +712,14 @@ public String getLastPermanentLocation() {
public void setLastPermanentLocation(String lastPermanentLocation) {
mLastPermanentLocation = lastPermanentLocation;
}

public void setMessage(String message) {
this.message = message;
}

/**
* Message that is returned by server, e.g. password policy violation on ocs share api
*
* @return message that can be shown to user
*/
public String getMessage() {
Expand All @@ -719,13 +729,13 @@ public String getMessage() {
@Override
public String toString() {
return "RemoteOperationResult{" +
"mSuccess=" + mSuccess +
", mHttpCode=" + mHttpCode +
", mHttpPhrase='" + mHttpPhrase + '\'' +
", mException=" + mException +
", mCode=" + mCode +
", message='" + message + '\'' +
", getLogMessage='" + getLogMessage() + '\'' +
'}';
"mSuccess=" + mSuccess +
", mHttpCode=" + mHttpCode +
", mHttpPhrase='" + mHttpPhrase + '\'' +
", mException=" + mException +
", mCode=" + mCode +
", message='" + message + '\'' +
", getLogMessage='" + getLogMessage() + '\'' +
'}';
}
}
Loading