Skip to content

Commit 22658c0

Browse files
Merge pull request #1857 from nextcloud/add-time-out-option-for-get-shares
feat: add time out option for get shares
2 parents 8cedae9 + 72d7395 commit 22658c0

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*/
1111
package com.owncloud.android.lib.resources.shares;
1212

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

3032
private static final String TAG = GetSharesRemoteOperation.class.getSimpleName();
31-
private boolean sharedWithMe = false;
33+
private final boolean sharedWithMe;
34+
private final SessionTimeOut sessionTimeOut;
3235

3336
public GetSharesRemoteOperation() {
34-
this(false);
37+
this(false, SessionTimeOutKt.getDefaultSessionTimeOut());
3538
}
3639

3740
public GetSharesRemoteOperation(boolean sharedWithMe) {
41+
this(sharedWithMe, SessionTimeOutKt.getDefaultSessionTimeOut());
42+
}
43+
44+
public GetSharesRemoteOperation(boolean sharedWithMe, SessionTimeOut sessionTimeOut) {
3845
this.sharedWithMe = sharedWithMe;
46+
this.sessionTimeOut = sessionTimeOut;
3947
}
4048

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

63+
get.getParams().setSoTimeout(sessionTimeOut.getReadTimeOut());
64+
client.setDefaultTimeouts(sessionTimeOut.getReadTimeOut(), sessionTimeOut.getConnectionTimeOut());
65+
5566
if (sharedWithMe) {
5667
get.setQueryString("shared_with_me=true");
5768
}
@@ -86,6 +97,4 @@ protected RemoteOperationResult<List<OCShare>> run(OwnCloudClient client) {
8697
private boolean isSuccess(int status) {
8798
return (status == HttpStatus.SC_OK);
8899
}
89-
90-
91100
}

0 commit comments

Comments
 (0)