mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 07:05:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add KEEP_SERVER_FOLDER click

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-08-21 10:18:24 +02:00
parent 986d0848fc
commit 7aac89d1d7
No known key found for this signature in database
GPG key ID: 4E577DC593B59BDF
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
View file

@ -125,17 +125,18 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
}
Decision.KEEP_SERVER_FOLDER -> {
fileDataStorageManager.offlineOperationDao.deleteByPath(path)
}
Decision.KEEP_BOTH_FOLDER -> {
fileDataStorageManager.keepOfflineOperationAndServerFile(entity)
backgroundJobManager.startOfflineOperations()
offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
}
else -> Unit
}
offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
}
}
}