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

Use remote path correctly

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-04-10 12:05:43 +02:00 committed by Alper Öztürk
parent eaa773d5a9
commit affc77715c
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,7 +178,7 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
if (result.isSuccess) {
existingFile = FileStorageUtils.fillOCFile(result.data[0] as RemoteFile)
existingFile?.lastSyncDateForProperties = System.currentTimeMillis()
startDialog()
startDialog(remotePath)
} else {
Log_OC.e(TAG, "ReadFileRemoteOp returned failure with code: " + result.httpCode)
showErrorAndFinish(result.httpCode)
@ -189,11 +189,16 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
}
}.start()
} else {
startDialog()
var remotePath = existingFile!!.remotePath
if (newFile?.isEncrypted == true) {
remotePath = fileStorageManager?.getEncryptedRemotePath(existingFile!!.remotePath)
}
startDialog(remotePath)
}
}
private fun startDialog() {
private fun startDialog(remotePath: String) {
val userOptional = user
if (!userOptional.isPresent) {
Log_OC.e(TAG, "User not present")
@ -206,7 +211,7 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
if (prev != null) {
fragmentTransaction.remove(prev)
}
if (existingFile != null && storageManager.fileExists(newFile?.remotePath)) {
if (existingFile != null && storageManager.fileExists(remotePath)) {
val dialog = ConflictsResolveDialog.newInstance(
existingFile,
newFile,