Sync conflict

[Queeq]

Steps to reproduce

Change nothing in existing auto-upload settings. Make sure new files are created in the folder configured for auto-upload.
or
Attempt manual file upload (files do not exist on the server)

I suspect this is started after the latest (3.11.0) update.

Expected behaviour

Files are uploaded

Actual behaviour

Files are not uploaded.

Notification: "File upload conflict. Pick which version to keep of <filename>"

In the app, in the "Uploads" screen, files are in the "Failed/pending restart" category with the message: "Sync conflict, please resolve manually". Pressing "Resolve conflict" does nothing. Pressing "Delete" does not delete anything, but attempts to upload are stopped.

Server configuration detail

Operating system: Linux 4.4.110 #62 SMP Fri Jan 5 20:38:04 EET 2018 x86_64

Webserver: nginx/1.10.3 (fpm-fcgi)

Database: mysql 10.0.38

PHP version:

7.0.33-0ubuntu0.16.04.12
Modules loaded: Core, date, libxml, openssl, pcre, zlib, filter, hash, Reflection, SPL, session, standard, cgi-fcgi, mysqlnd, PDO, xml, apcu, calendar, ctype, curl, dom, mbstring, fileinfo, ftp, gd, gettext, iconv, igbinary, imagick, imap, intl, json, exif, mcrypt, mysqli, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, readline, redis, shmop, SimpleXML, sockets, sqlite3, sysvmsg, sysvsem, sysvshm, tokenizer, wddx, xmlreader, xmlwriter, xsl, zip, Zend OPcache

Nextcloud version: 15.0.14 - 15.0.14.1

Updated from an older Nextcloud/ownCloud or fresh install: Updated

Where did you install Nextcloud from: I don't remember

List of activated apps

Enabled:
 - accessibility: 1.1.0
 - activity: 2.8.2
 - cloud_federation_api: 0.1.0
 - comments: 1.5.0
 - dav: 1.8.2
 - federatedfilesharing: 1.5.0
 - federation: 1.5.0
 - files: 1.10.0
 - files_pdfviewer: 1.4.0
 - files_sharing: 1.7.0
 - files_texteditor: 2.7.0
 - files_trashbin: 1.5.0
 - files_versions: 1.8.0
 - files_videoplayer: 1.4.0
 - firstrunwizard: 2.4.0
 - gallery: 18.2.0
 - issuetemplate: 0.6.0
 - logreader: 2.0.0
 - lookup_server_connector: 1.3.0
 - nextcloud_announcements: 1.4.0
 - notifications: 2.3.0
 - oauth2: 1.3.0
 - password_policy: 1.5.0
 - provisioning_api: 1.5.0
 - serverinfo: 1.5.0
 - sharebymail: 1.5.0
 - support: 1.0.0
 - survey_client: 1.3.0
 - systemtags: 1.5.0
 - theming: 1.6.0
 - twofactor_backupcodes: 1.4.1
 - updatenotification: 1.5.0
 - workflowengine: 1.5.0
Disabled:
 - admin_audit
 - bruteforcesettings
 - encryption
 - files_external
 - user_ldap

Configuration (config/config.php)

{
    "instanceid": "***REMOVED SENSITIVE VALUE***",
    "passwordsalt": "***REMOVED SENSITIVE VALUE***",
    "datadirectory": "***REMOVED SENSITIVE VALUE***",
    "dbtype": "mysql",
    "version": "15.0.14.1",
    "dbname": "***REMOVED SENSITIVE VALUE***",
    "dbhost": "***REMOVED SENSITIVE VALUE***",
    "dbtableprefix": "oc_",
    "dbuser": "***REMOVED SENSITIVE VALUE***",
    "dbpassword": "***REMOVED SENSITIVE VALUE***",
    "installed": true,
    "forcessl": true,
    "loglevel": 1,
    "theme": "",
    "maintenance": false,
    "memcache.local": "\\OC\\Memcache\\APCu",
    "memcache.locking": "\\OC\\Memcache\\Redis",
    "redis": {
        "host": "***REMOVED SENSITIVE VALUE***",
        "port": 6379
    },
    "trusted_domains": [
        "***REMOVED SENSITIVE VALUE***"
    ],
    "secret": "***REMOVED SENSITIVE VALUE***",
    "mail_smtpmode": "smtp",
    "mail_from_address": "***REMOVED SENSITIVE VALUE***",
    "mail_domain": "***REMOVED SENSITIVE VALUE***",
    "mail_smtpport": "25",
    "trashbin_retention_obligation": "auto",
    "updatechecker": false,
    "htaccess.RewriteBase": "\/",
    "mail_smtphost": "***REMOVED SENSITIVE VALUE***",
    "updater.release.channel": "stable",
    "overwrite.cli.url": "https:\/\/***REMOVED SENSITIVE VALUE***",
    "mysql.utf8mb4": true
}

Are you using external storage, if yes which one: no

Are you using encryption: no

Are you using an external user-backend, if yes which one: no

Client configuration

Android version: 9
Device model: SM-G930F
Stock or customized system: LineageOS
Nextcloud app version: 3.11.0

Logs

Web server error log

2020/03/27 22:20:48 [info] 64263#64263: *1162408 client <IP> closed keepalive connection
2020/03/27 22:20:48 [info] 64263#64263: *1162406 client <IP> closed keepalive connection
2020/03/27 22:21:27 [info] 64263#64263: *1162427 client <IP> closed keepalive connection

Nextcloud log

Empty

Web server access log

<IP> - phone [27/Mar/2020:22:43:25 +0200] "HEAD /remote.php/webdav/IMG_20200327_163254.jpg HTTP/1.1" 302 0 "-" "Mozilla/5.0 (Android) Nextcloud-android/3.11.0"
<IP> - phone [27/Mar/2020:22:43:25 +0200] "HEAD /apps/files/ HTTP/1.1" 200 0 "-" "Mozilla/5.0 (Android) Nextcloud-android/3.11.0"
<IP> - phone [27/Mar/2020:22:43:25 +0200] "HEAD /remote.php/webdav/IMG_20200327_163714.jpg HTTP/1.1" 302 0 "-" "Mozilla/5.0 (Android) Nextcloud-android/3.11.0"
<IP> - phone [27/Mar/2020:22:43:25 +0200] "HEAD /apps/files/ HTTP/1.1" 200 0 "-" "Mozilla/5.0 (Android) Nextcloud-android/3.11.0"

[Queeq]

Following advice in #3635, pinging @tobiasKaminsky and @ArisuOngaku

[zero-24]

It happen to me as well it might be a good idea to add a switch to turn this check off per auto upload rule? Or having a global option to turn that check off.

[Queeq]

Also I tried to roll back to Nextcloud Android client 3.10.1 and it started to work, so the problem is definitely introduced in 3.11.0.

[tobiasKaminsky]

What kind of files are those?
Auto upload is expected to work fine with files that not have the same file name, e.g. IMG-2020-03-30-090910.jpg, but not with e.g. backup1.sql

[zero-24]

Yes for me it is the WhatsApp Backup. WhatsApp creates two files the backup with date and time attaced (that uploads fine) and the latest version msgstore.db.crypt12 as well as some setting files that always have the same name and should be overwritten with the latest version but now create this conflict message.

I agree that in the most cases the message is fine but therefore i suggested to make it possible to switch the check off on an per auto upload rule basis.

[tobiasKaminsky]

Thanks for info.

@ArisuOngaku seems, we really need a default policy for auto upload folders.
Can you do this? ❤️
If not, I will schedule some time for it.

[GitOkkie]

I've got this problem with the log file of an app I use. Until now, the new one just overwrites the old one. Since this week, I get this message every day after using this app. Unfortunately the message keeps popping up, even after switching on "Also upload existing files".

The file name is "aCar.log" and this is my config for that directory:

[dbrand666]

We don't need an option. We just need to fix the conflict resolution. If the file has only changed on one end, it's fine to overwrite the one that hasn't changed. The only time it should report a conflict is if the file changed on both sides since the last sync.

[ashpieboop]

@tobiasKaminsky I'll do it! :)

@dbrand666 what if the local version is not supposed to change and it changes for a user-unexpected reason? Overwriting the remote file means loss of data.
This feature is called "auto upload", not "file/folder sync", so this would be misleading.
If there is no existing issue about this, you may want to open one as this is, imho, a design suggestion.

[ashpieboop]

@tobiasKaminsky My apologies, I widely underestimated the amount of work it'll take to develop this properly; I unfortunately can't do this in the near future. Sorry for the inconvenience.