Skip to content

Auto release file lock on closing WebView #17384

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
kitzberger wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −1
Open

Auto release file lock on closing WebView #17384

Show file tree
Hide file tree
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
28 changes: 28 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@

import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
import com.nextcloud.android.lib.resources.files.ToggleFileLockRemoteOperation;
import com.nextcloud.client.account.User;
import com.nextcloud.common.NextcloudClient;
import com.nextcloud.utils.extensions.IntentExtensionsKt;
import com.owncloud.android.R;
import com.owncloud.android.databinding.RichdocumentsWebviewBinding;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.datamodel.SyncedFolderObserver;
import com.owncloud.android.datamodel.SyncedFolderProvider;
import com.owncloud.android.datamodel.ThumbnailsCacheManager;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.asynctasks.TextEditorLoadUrlTask;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.MimeTypeUtil;
Expand Down Expand Up @@ -100,10 +103,35 @@ public void onUrlLoaded(String loadedUrl) {
}

public void closeView() {
unlockFile();
getWebView().destroy();
finish();
}

@Override
protected void onDestroy() {
unlockFile();
super.onDestroy();
}

private void unlockFile() {
OCFile file = getFile();
Optional<User> user = getUser();

if (file == null || !user.isPresent()) {
return;
}

new Thread(() -> {
try {
NextcloudClient client = clientFactory.createNextcloudClient(user.get());
new ToggleFileLockRemoteOperation(false, file.getRemotePath()).execute(client);
} catch (Exception e) {
Log_OC.e(TAG, "Failed to unlock file on editor close", e);
}
}).start();
}

public void reload() {
if (getWebView().getVisibility() != View.VISIBLE) {
return;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class ExternalSiteWebView extends FileActivity {
public static final String EXTRA_SHOW_TOOLBAR = "SHOW_TOOLBAR";
public static final String EXTRA_TEMPLATE = "TEMPLATE";

private static final String TAG = ExternalSiteWebView.class.getSimpleName();
protected static final String TAG = ExternalSiteWebView.class.getSimpleName();

protected boolean showToolbar = true;
private ExternalsiteWebviewBinding binding;
Expand Down