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

Open Document Timeout #14510

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Open Document Timeout #14510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5232419
fix ImageLoadingOffline
Feb 5, 2025
36e47c0
reduce timeouts to speed up app
Feb 6, 2025
83156a1
reduce timeouts to speed up app
Feb 6, 2025
ea6d645
lower timeout for ocversion check
Feb 6, 2025
74fe2d2
add constants for timeout values
Feb 6, 2025
46c3385
fix check expiration
Feb 5, 2025
406d0f2
alternative method
Feb 6, 2025
0d18f89
fix docs that etag can't be read on
Feb 6, 2025
2c77117
fix docs that etag can't be read on
Feb 6, 2025
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
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.nextcloud.android.lib.resources.directediting.DirectEditingObtainRemoteOperation;
import com.nextcloud.client.account.User;
import com.nextcloud.common.NextcloudClient;
import com.nextcloud.common.SessionTimeOut;
import com.nextcloud.utils.extensions.RemoteOperationResultExtensionsKt;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
Expand Down Expand Up @@ -385,7 +386,8 @@ private RemoteOperationResult checkForChanges(OwnCloudClient client) {
Log_OC.d(TAG, "Checking changes in " + user.getAccountName() + remotePath);

// remote request
result = new ReadFileRemoteOperation(remotePath).execute(client);
SessionTimeOut sessionTimeOut = new SessionTimeOut(1000,1000);
result = new ReadFileRemoteOperation(remotePath, sessionTimeOut).execute(client);

if (result.isSuccess()) {
OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/operations/UpdateOCVersionOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {

try {
getMethod = new GetMethod(statUrl);
int status = client.executeMethod(getMethod);
int status = client.executeMethod(getMethod, 1000, 1000);
if (status != HttpStatus.SC_OK) {
result = new RemoteOperationResult(false, getMethod);
client.exhaustResponse(getMethod.getResponseBodyAsStream());
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.nextcloud.client.preferences.AppPreferences;
import com.nextcloud.client.preferences.AppPreferencesImpl;
import com.nextcloud.client.utils.HashUtil;
import com.nextcloud.common.SessionTimeOut;
import com.nextcloud.utils.extensions.ContextExtensionsKt;
import com.nextcloud.utils.fileNameValidator.FileNameValidator;
import com.owncloud.android.MainApp;
Expand Down Expand Up @@ -284,11 +285,12 @@ public ParcelFileDescriptor openDocument(String documentId, String mode, Cancell
private boolean hasServerChange(Document document) throws FileNotFoundException {
Context context = getNonNullContext();
OCFile ocFile = document.getFile();
RemoteOperationResult result = new CheckEtagRemoteOperation(ocFile.getRemotePath(), ocFile.getEtag())
SessionTimeOut sessionTimeOut = new SessionTimeOut(1000,1000);
RemoteOperationResult result = new CheckEtagRemoteOperation(ocFile.getRemotePath(), ocFile.getEtag(), sessionTimeOut)
.execute(document.getUser(), context);
switch (result.getCode()) {
case ETAG_CHANGED:
return true;
return result.getData() != null;
case ETAG_UNCHANGED:
return false;
case FILE_NOT_FOUND:
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/asynctasks/GetRemoteFileTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package com.owncloud.android.ui.asynctasks

import android.content.Context
import com.nextcloud.client.account.User
import com.nextcloud.common.SessionTimeOut
import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.common.OwnCloudClient
Expand All @@ -27,8 +28,15 @@ class GetRemoteFileTask(

data class Result(val success: Boolean = false, val file: OCFile = OCFile("/"))

// Define constants for timeouts
companion object {
private const val CONNECTION_TIMEOUT = 1000
private const val READ_TIMEOUT = 1000
}

override fun invoke(): Result {
val result = ReadFileRemoteOperation(fileUrl).execute(client)
val sessionTimeout = SessionTimeOut(READ_TIMEOUT, CONNECTION_TIMEOUT)
val result = ReadFileRemoteOperation(fileUrl, sessionTimeout).execute(client)
if (result.isSuccess) {
val remoteFile = result.getData().get(0) as RemoteFile
val temp = FileStorageUtils.fillOCFile(remoteFile)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,9 +1217,9 @@ private void fileOnItemClick(OCFile file) {
case GALLERY_SEARCH -> VirtualFolderType.GALLERY;
default -> VirtualFolderType.NONE;
};
((FileDisplayActivity) mContainerActivity).startImagePreview(file, type, !file.isDown());
((FileDisplayActivity) mContainerActivity).startImagePreview(file, type, file.isDown());
} else {
((FileDisplayActivity) mContainerActivity).startImagePreview(file, !file.isDown());
((FileDisplayActivity) mContainerActivity).startImagePreview(file, file.isDown());
}
} else if (file.isDown() && MimeTypeUtil.isVCard(file)) {
((FileDisplayActivity) mContainerActivity).startContactListFragment(file);
Expand Down
Loading