Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inform User about Conflict File creation #3222

Closed
mlsbr opened this issue May 11, 2015 · 15 comments · Fixed by #4641
Closed

Inform User about Conflict File creation #3222

mlsbr opened this issue May 11, 2015 · 15 comments · Fixed by #4641
Assignees
Labels
Enhancement ReadyToTest QA, please validate the fix/enhancement
Milestone

Comments

@mlsbr
Copy link

mlsbr commented May 11, 2015

Hi,
Currently, when the conflict file is created, it is not synchronized with the server, and the user is not warned.
To prevent the user having to check every time you save a file (to check if it was synchronized), I suggest that a warning message is displayed to the user that the file was not synchronized and why.

Thanks!

@dragotin dragotin changed the title Suggestion Inform User about Conflict File creation May 12, 2015
@guruz
Copy link
Contributor

guruz commented May 12, 2015

CC @jancborchardt

@guruz guruz added this to the 2.0 - Multi-account milestone May 12, 2015
@jancborchardt
Copy link
Member

Well honestly I think we should sync conflict files. I’m pretty sure this is what Dropbox does as well, and it’s just good practice to make sure you have all the files everywhere.

@dragotin dragotin self-assigned this May 19, 2015
@PVince81
Copy link
Contributor

Note that if conflict files are allowed to appear on the ownCloud server, this might open the door to other concepts like syncing files between external storage and the ownCloud server (instead of a direct connection). In such situation, conflicts could also occur: owncloud/core#5225

@MTRichards
Copy link

Definitely an enhancement, and we need to think through this in detail.

@moscicki
Copy link
Contributor

@jancborchardt: I definitely agree. The current situation is problematic because it is in practice easy for a user to overlook that some files are not synced -- and the conflict file contains local changes which are not saved anywhere. This may lead eventually to data loss (when user realizes it may be too late -- his laptop just fell off the table). But this requires some careful thinking, agreed @MTRichards .

@guruz
Copy link
Contributor

guruz commented Oct 2, 2015

In general, I think we need a way to have user notifications displayed (also in tray?) that are not associated to a SyncFileItem
@dragotin @danimo

@guruz
Copy link
Contributor

guruz commented Nov 10, 2015

Linking #4079

@guruz guruz modified the milestones: 2.1.1-nextpatch, 2.1-current Nov 30, 2015
@dragotin dragotin modified the milestones: 2.2-next, 2.1.1-current Jan 8, 2016
@dragotin
Copy link
Contributor

dragotin commented Mar 9, 2016

Well. In the beginning we had the idea of overlaying the tray icon with a warning sign like
warning 2x to indicate the user that there is something she should check.

That was removed again as we agreed to not disturb the users.

@guruz
Copy link
Contributor

guruz commented Mar 11, 2016

Can we agree to a simple and doable solution for 2.2? @jancborchardt @dragotin
One of those:

  1. Display a desktop notification
  2. Make the file show up in Unsynced files as "Conflict file created" or something like that

dragotin pushed a commit that referenced this issue Apr 5, 2016
If there were conflicts, users want to have a tray notification that warn
about.
This will help for #3222
@guruz guruz reopened this Apr 6, 2016
@guruz guruz added the ReadyToTest QA, please validate the fix/enhancement label Apr 6, 2016
@davitol
Copy link

davitol commented Apr 8, 2016

Display a desktop notification
Make the file show up in Unsynced files as "Conflict file created" or something like that

Windows10 and owncloud-2.2.0.5855.
I could not get a notification after a conflict happened. @guruz could you please define some steps to get the notification?

@dragotin
Copy link
Contributor

dragotin commented Apr 8, 2016

@davitol Easiest is to stop the client, and change the same file on both the client- and server-side. If you restart the client, it tries to sync and will detect a conflict.

You should see a tray notification about that.

@davitol
Copy link

davitol commented Apr 11, 2016

👍 WFM. A tray notification related to the conflict is shown. Version 2.2.0-nightly20160411 (build 5985)

Note: After creating a conflict, the not synced advice disappears in this table but the tab still counts 1 file.

sync1

@guruz guruz removed the ReadyToTest QA, please validate the fix/enhancement label Apr 13, 2016
@dragotin dragotin reopened this Apr 18, 2016
@dragotin dragotin added the ReadyToTest QA, please validate the fix/enhancement label Apr 18, 2016
@dragotin
Copy link
Contributor

I fixed the wrong issue count in the tab text.

@mcastroSG
Copy link

Hi hi:

@dragotin , after retest https://github.com/owncloud/client/issues/3222#issuecomment-208262494 seems to be solved the problem about wrong count in the tab text.

Windows
Client Version: Version 2.2.0-nightly20160419 (build 6002)
Client OS: Windows 10
Server Version: 9.0.1
Server OS: Ubuntu

MacOS
Client Version: Version 2.2.0-nightly20160419 (build 3282)
Client OS: El Capitan 10.11.4
Server Version: 9.0.1
Server OS: Ubuntu

Regards

@dragotin
Copy link
Contributor

Ok, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement ReadyToTest QA, please validate the fix/enhancement
Projects
None yet
Development

Successfully merging a pull request may close this issue.

9 participants