浏览代码

Add KEEP_OFFLINE_FOLDER click

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 10 月之前
父节点
当前提交
dfd13650d6
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt

+ 2 - 1
app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt

@@ -121,7 +121,8 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
                 offlineOperation?.let { entity ->
                     when(decision) {
                         Decision.KEEP_OFFLINE_FOLDER -> {
-
+                            fileOperationsHelper?.removeFiles(listOf(serverFile), false, false)
+                            backgroundJobManager.startOfflineOperations()
                         }
 
                         Decision.KEEP_SERVER_FOLDER -> {