[UI] Add option to upload conflict files to the "Advanced" Settings

[michaelstingl]

I'd like to try "default=on", at least in the 2.7.0-beta3.

We already have an Environment Variable for it: OWNCLOUD_UPLOAD_CONFLICT_FILES (Set to "1" to enable uploading conflict files to the server.)

[TheOneRing]

bool Capabilities::uploadConflictFiles() const
{
    static auto envIsSet = !qEnvironmentVariableIsEmpty("OWNCLOUD_UPLOAD_CONFLICT_FILES");
    static int envValue = qEnvironmentVariableIntValue("OWNCLOUD_UPLOAD_CONFLICT_FILES");
    if (envIsSet)
        return envValue != 0;

    return _capabilities[QStringLiteral("uploadConflictFiles")].toBool();
}

Seems to be a server setting, I guess we should coordinate with the server team?

[michaelstingl]

Seems to be a server setting, I guess we should coordinate with the server team?

Should be a server setting, but was never implemented.

[TheOneRing]

I see

[TheOneRing]

TODO: Investigate conflict file logic.

[glpatcern]

Hello, may I ask what is the status of this feature, now that the sync client is v4+?

[michaelstingl]

Hello, may I ask what is the status of this feature, now that the sync client is v4+?

The latest implementation didn't work, so it was dropped:

• https://github.com/owncloud/client/pull/8986#issuecomment-953708676

[glpatcern]

The latest implementation didn't work, so it was dropped:

Thanks Michael for the quick reaction. That implementation was from 2 years ago, what about current plans?

[michaelstingl]

No plans currently