Offline upload conflicts resolution overwrites the remote file even if the user select to keep both

未关闭
#17,589 1 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看

维护者通常 1 天内回复

还没有人认领这个 Issue。

评估

难度
3/5
预计耗时
1-2 天
新手友好度
68/100
Issue 类型
缺陷
描述清晰度
基本清楚
活跃度
活跃
技术栈
android, kotlin
领域
mobile-dev

调研方向

从 ConflictsResolveActivity 开始,跟踪 showOfflineOperationConflictDialog() 在离线上传 worker 中的调用流程,注意 Decision.KEEP_BOTH_FOLDER 与 KEEP_BOTH 之间的选择。复现离线冲突流程,然后验证选择保留两者会保留远程文件,并创建一个重命名后的上传文件,与在线行为一致。

由索引模型根据 Issue 内容生成。

描述

approved bug
⚠️ Before posting ⚠️
  • This is a bug, not a question or an enhancement.
  • I've searched for similar issues and didn't find a duplicate.
  • I've written a clear and descriptive title for this issue, not just "Bug" or "Crash".
  • I agree to follow Nextcloud's Code of Conduct.
Steps to reproduce
  1. Create a folder
  2. Upload a file (e.g. a text file)
  3. Go offline (e.g. airplane mode)
  4. Change the file (e.g. add some characters)
  5. Upload a second time the file
  6. Go online
  7. A conflict message is shown
  8. Choose to keep BOTH files
  9. The online file is overwritten by the new uploaded file (only one file present in the folder at the end)
Expected behaviour

The folder should contain two files: the remote one and the newly uploaded, renamed (as it happens if following the same steps without ever going offline).

Actual behaviour

The online file is overwritten by the new uploaded file (only one file present in the folder at the end)

Android version

17

Device brand and model

Emulator on Android Studio

Stock or custom OS?

Stock

Nextcloud android app version

35.0.0 RC1

Nextcloud server version

Nextcloud Hub 26 Spring (36.0.0 dev)

Using a reverse proxy?

No

Android logs

No response

Server error logs

Additional information

I think it's related to ConflictsResolveActivity having its own flow for offline uploads (see showOfflineOperationConflictDialog()) and passing Decision.KEEP_BOTH_FOLDER instead of KEEP_BOTH to the worker

主要语言
Kotlin
星标
5.7k
派生
2.1k
平均合并
1 天 22 小时
30 天内合并 PR
135

环境准备

在 Codespaces 中打开

在浏览器里用你自己的 GitHub 账号启动这个项目的开发容器。

从这里开始

  1. 先读完整个 Issue,再读项目的贡献指南。
  2. 在 Issue 下留言说明你要接手 —— 这能避免两个人做同样的事。
  3. Fork 仓库,在一个分支上完成修改。
  4. 提交 Pull Request,并在描述里引用这个 Issue 编号。

nextcloud/android 的其他 Issue

查看 nextcloud/android 的全部 Issue

相似的 Issue

更多 Kotlin Issue

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。