Skip to content

feat: add time out option for get shares #1857

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add time out option for get shares #1857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions ...ary/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
*/
package com.owncloud.android.lib.resources.shares;

import com.nextcloud.common.SessionTimeOut;
import com.nextcloud.common.SessionTimeOutKt;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
Expand All @@ -28,14 +30,20 @@
public class GetSharesRemoteOperation extends RemoteOperation<List<OCShare>> {

private static final String TAG = GetSharesRemoteOperation.class.getSimpleName();
private boolean sharedWithMe = false;
private final boolean sharedWithMe;
private final SessionTimeOut sessionTimeOut;

public GetSharesRemoteOperation() {
this(false);
this(false, SessionTimeOutKt.getDefaultSessionTimeOut());
}

public GetSharesRemoteOperation(boolean sharedWithMe) {
this(sharedWithMe, SessionTimeOutKt.getDefaultSessionTimeOut());
}

public GetSharesRemoteOperation(boolean sharedWithMe, SessionTimeOut sessionTimeOut) {
this.sharedWithMe = sharedWithMe;
this.sessionTimeOut = sessionTimeOut;
}

@Override
Expand All @@ -52,6 +60,9 @@ protected RemoteOperationResult<List<OCShare>> run(OwnCloudClient client) {
get.setQueryString(INCLUDE_TAGS);
get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);

get.getParams().setSoTimeout(sessionTimeOut.getReadTimeOut());
client.setDefaultTimeouts(sessionTimeOut.getReadTimeOut(), sessionTimeOut.getConnectionTimeOut());

if (sharedWithMe) {
get.setQueryString("shared_with_me=true");
}
Expand Down Expand Up @@ -86,6 +97,4 @@ protected RemoteOperationResult<List<OCShare>> run(OwnCloudClient client) {
private boolean isSuccess(int status) {
return (status == HttpStatus.SC_OK);
}


}
Loading