chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-15 09:30:05 +02:00
Code Activity
17,398 Commits 4 Branches 173 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag 5e33898a08 Avatar: Use QImage instead of QPixmap to avoid dep on QApplication. 
That fixes the test suite.
 2017-03-09 22:34:36 +01:00
Klaas FreitagandGitHub 9f2ae5dd17 Add a note that the source repositories need to be enabled. (#5239) 
* Add a note that the source repositories need to be enabled.

* Fix typo, is => are.
 2016-10-13 16:22:54 +02:00
Klaas Freitag 16e28567a6 Folderman: Some comments for the checkPathValidityForNewFolder method. 2016-10-12 18:16:53 +02:00
Klaas Freitag 3bef42db6b folderman: checkPathValidityForNewFolder - correct file path comparison 
It now checks based on the correct case sensitivity and also using the new
method for filename comparison.
 2016-10-12 14:50:10 +02:00
Klaas Freitag 27d23edacc Utility: Add a function to check if two filenames are equal plus test. 
It calls canonical path always and works with the correct case preserving
depending on the platform.
 2016-10-12 14:48:00 +02:00
Klaas Freitag e1a48e3c33 Move the journal file name generation to the syncjournaldb class. 
As requested by Olivier.
 2016-10-10 16:59:17 +02:00
Klaas Freitag 5d13f9290f Fix the folderman test, adopting the checkPathValidity method tests. 2016-10-07 16:24:09 +02:00
Klaas Freitag c84140d293 checkPathValidityForNewFolder: Catch sync folders underneath sym links. 
plus some whitespace changes.
 2016-10-07 16:23:13 +02:00
Klaas Freitag 838c072ccc Folder Setup: Allow to set up more sync connects to the same folder. 
One local folder can now be configured as sync target for multiple
accounts as long as their url and user differ.

Also this patch accepts that the sync folder is behind a symlink.
Also this patch fixes a bug that before the user input was taken
canonically which was not working for the symlink handling.
 2016-09-30 14:08:00 +02:00
Klaas Freitag ed6a708460 SyncJournalDb: Migrate the old csync journal to the new name. 
Migration strategy to the new filename.
 2016-09-29 16:41:11 +02:00
Klaas Freitag 0c9dcdafc2 csync: Only free the statedb filename on destroy. 
The filename must not be wiped in csync_commit as that is
happening after every sync. It is only set once in the
constructor of the SyncEngine in csync_init().
 2016-09-29 16:36:14 +02:00
Klaas FreitagandOlivier Goffart 8b9ca63eeb Dolphin Plugin: Use the Application name for the socket path (#5172) 
do not hardcode.

This should fix #5165
(cherry picked from commit 2d110540ee)
 2016-09-22 09:20:47 +02:00
Klaas FreitagandGitHub 2d110540ee Dolphin Plugin: Use the Application name for the socket path (#5172) 
do not hardcode.

This should fix #5165
 2016-09-12 14:12:33 +02:00
Klaas FreitagandMarkus Goetz c97d8aa8fd Show the rename target in the client log file. (#5149) 2016-09-05 13:26:49 +02:00
Klaas Freitag f0dc3b2deb FolderWatcher: Also ignore the new sync journal file name format. 2016-09-02 16:19:10 +02:00
Klaas Freitag 84ede3f01f Make sync journal name generating a method of SyncJournal. 
Before it was in Folder, however, the command line client does not
have the Folder class. To not duplicate code, the function to generate
the sync journal name went to SyncEngine class.
 2016-09-02 16:19:10 +02:00
Klaas Freitag 2daf895e43 Documentation: Mention the new format for the journal file. 2016-09-02 16:19:10 +02:00
Klaas Freitag 3b651b2da9 folderman: Clean some comments 2016-09-02 16:19:04 +02:00
Klaas Freitag 6fd930908c csync_tests: Adopted to new cmocka API. 2016-09-02 15:49:54 +02:00
Klaas Freitag 62125a442d csync_exclude: Also exclude the new syncjournal filename. 2016-09-02 15:49:21 +02:00
Klaas Freitag 2d54fb2ff9 csync_update: Do not check to exclude .csync_journal.db 
It is indeed already handled by csync_exclude.
 2016-09-02 15:48:45 +02:00
Klaas Freitag e46fad52bb Make the sync journal file name a method of the Folder class. 
The sync journal name has a dependency on the remote url now.
 2016-09-02 12:29:21 +02:00
Klaas FreitagandMarkus Goetz 5ac434a740 Logs: Add the name of the platform we're running on to the log. (#5082) 2016-07-28 16:30:40 +02:00
Klaas FreitagandMarkus Goetz ebcec44202 ShibbolethView: Open a debug windows that shows cipher info. (#5080) 
It opens a window and connects to a cipher test
page, showing the output from there, that helps for debugging.

The window is enabled by setting the environment variable
OWNCLOUD_SHIBBOLETH_DEBUG
 2016-07-25 17:47:23 +02:00
Klaas Freitag f3cfd2b70b csync: Free statedb file member before realloc 2016-07-17 21:13:17 +02:00
Klaas Freitag 78caa1a712 Fix tests for syncjournaldb 2016-07-17 21:10:07 +02:00
Klaas Freitag 0884ad6517 owncloudcmd: Adopt to new syncJournalDb MD5 based name schema. 2016-07-10 13:05:09 +02:00
Klaas Freitag 37fc4e4332 SyncJournalDb: Cleanup of Constructor interface. 
The parameter path is not longer needed.
 2016-07-10 13:04:29 +02:00
Klaas Freitag 9cc90159f1 FolderMan: ensureJournalGone needs to know the exact journal name, WIP 2016-07-10 12:57:35 +02:00
Klaas Freitag 4ceee86c66 SyncEngine: Calculate a uniq journal name using the remote account. 
That should allow to sync the same local folder to multiple remote destinations.

see #3764
 2016-07-10 12:56:43 +02:00
Klaas Freitag b9ea7c3414 csync: Do not compute the journal name in csync_update any more. 
Rely on the name that was passed to csync_init()
 2016-07-10 12:54:33 +02:00
Klaas Freitag 3033e693be Folder: For wipe reuse the journal name from SyncEngine. 
Do not compute on its own any more.
 2016-07-10 12:52:47 +02:00
Klaas Freitag a1bc01d3b1 SyncJournalDb: Add a method to set the name of the db file. 2016-07-10 12:51:42 +02:00
Klaas FreitagandMarkus Goetz 191177ff22 excludes: Only log if the pattern was really logged. (#4989) 2016-06-20 15:50:20 +02:00
Klaas Freitag 9a2450c4c1 Update changelog for 2.2.1 2016-05-30 17:19:40 +02:00
Klaas Freitag 035058934f Documentation draft to introduce notifications. 
Also added a screenshot.
 2016-05-11 11:16:08 +02:00
Klaas Freitag 9b1f46e560 Fix exclude unit test, adopt to new Iface of isExcluded. 2016-05-10 16:46:08 +02:00
Klaas Freitag 9e7a8e619b Fix utility test: Pass a command name to do the version check. 2016-05-10 16:26:42 +02:00
Klaas Freitag 9c0cd2b13e Added Changelog for 2.2.0 2016-05-10 15:39:44 +02:00
Klaas Freitag 641125eac1 Fix nautilus and nemo plugin branding strings. (#4780) 
* Fix nautilus and nemo plugin branding strings.

Fix for owncloud/enterprise#1314

* nautilus plugin: Add a comment why the line needs to stay unchanged.
 2016-05-03 11:36:56 +02:00
Klaas Freitag e70b78d14b Merge pull request #4738 from owncloud/fix_3411 
Disambiguate socket API pathes on Windows with user name
 2016-04-28 13:46:10 +02:00
Klaas Freitag 6814342d1f Merge pull request #4748 from owncloud/win_stat_revisited 
vio for windows: Use more graceful create file params.
 2016-04-28 13:45:30 +02:00
Klaas Freitag 051a348afd Vio for windows: Removed the overlap param again. 
After discussion and studying docs again we agreed that
the parameter is not neccessary here as it only affects
the process that opens the handle. And we do not want to
do async stuff.
 2016-04-27 11:37:21 +02:00
Klaas Freitag 07bdd519e9 vio for windows: Use more graceful create file params. 2016-04-27 11:17:42 +02:00
Klaas Freitag 35d4b96339 Set base version to 2.3.0. For 2.2, please use the branch 2.2 2016-04-25 14:15:17 +02:00
Klaas Freitag 57f0603e0e Doc: Applied review feedback for overlay icon docs. 2016-04-22 09:56:53 +02:00
Klaas Freitag b61ae351dd Merge pull request #4713 from owncloud/fix_win-sis 
Fix sync to Windows deduplication enabled storages
 2016-04-22 09:47:06 +02:00
Klaas Freitag 6ba7c6e2d3 Windows VIO: Remove unused variable. 2016-04-21 17:40:01 +02:00
Klaas Freitag 055c2ef73f local_vio_win: Fix handling files that have been deduplicated 
as part of Windows SIS or Data Deduplication. Fixes #4056
 2016-04-21 17:38:43 +02:00
Klaas Freitag e5a5b95b9a Merge pull request #4689 from owncloud/overlays_handle_root 
SyncFileStatusTracker: Add a method to handle the root folder of the sync.

Also, handle new files put in the sync in the statustracker logic.
 2016-04-21 15:01:11 +02:00
Klaas Freitag 7acdf50a2c SocketAPI: Code simplifications as asked for in the review. 2016-04-21 14:54:13 +02:00
Klaas Freitag 361ebf5464 SyncFileStatusTracker: Remember the state of new files. 
In the before-propagate slot, new files that wait to be
pushed to the server are remembered in the _syncProblems
map. That way, the parents show a sync icon properly as
asked for in #4682.

After the item has been transfered properly, the item is
removed from the map again because success is the default.
 2016-04-21 13:56:08 +02:00
Klaas Freitag b56919d0c4 SocketAPI: Return NOP state if folder is diconnected or paused. 
Later, we can send a specific state for that.
 2016-04-20 17:14:12 +02:00
Klaas Freitag f72c7f43bf Nautilus plugin: Be more robust against new states from socketapi 
Do not bail out if an unknown state comes from SocketApi
 2016-04-20 17:13:06 +02:00
Klaas Freitag add29befee Nautilus plugin: Remove the bogus logging 2016-04-20 17:12:21 +02:00
Klaas Freitag c379593c0f Doc: Draft overlay icons 2016-04-19 18:20:23 +02:00
Klaas Freitag bd37eab3ad SocketAPI: Display a warning on the directory if there are errors 
Errors with individual files within a directory now result in
a warning label on the parent directories.
 2016-04-19 18:18:00 +02:00
Klaas Freitag 2ab4caf007 ProtocolWidget: Display the recalculated number of issues. 
Should fix #3222
 2016-04-18 16:48:37 +02:00
Klaas Freitag 11d3aa3c4f Protocolwidget: Removed some leftovers from refactoring. 2016-04-18 16:47:14 +02:00
Klaas Freitag 0f3d6d4160 SyncFileStatusTracker: Add a method to handle the root item. 2016-04-15 15:02:02 +02:00
Klaas Freitag e2622310df Merge pull request #4670 from owncloud/implement_ep_1136_2nd_attempt 
Make postfixlineedit more userfriendly, rename email id string to "Email"
 2016-04-15 10:17:03 +02:00
Klaas Freitag 4ad8e04bc3 Merge pull request #4684 from owncloud/less_socket_api_updates 
Less socket api updates
 2016-04-15 10:15:07 +02:00
Klaas Freitag 8007331462 SocketAPI: Remove unneeded logging. 2016-04-14 15:39:46 +02:00
Klaas Freitag 12330b38e9 Folderman: Remove one call to updateFolderView. 
The reason is that updateFolderView is invoked by the
emitted signal folderSyncStateChange() anyway.

This will reduce the traffic over the SocketAPI nicely,
maybe this was the reason why it was slower than before.
 2016-04-14 15:26:11 +02:00
Klaas Freitag 8eb53fa9ae nautilus integration: Handle NOP as empty. 2016-04-14 15:24:46 +02:00
Klaas Freitag ed3203d25d Merge pull request #4659 from owncloud/fix_client_4651 
Fix client #4651
 2016-04-13 12:02:45 +02:00
Klaas Freitag 15988c6fda SocketAPI: Use NOP only, not NONE in the share api protocol. 
Otherwise, plugins might brake, as the linux one did.
 2016-04-12 18:28:27 +02:00
Klaas Freitag f443377978 Merge pull request #4664 from ckamm/hiddenfiles 
Fix hidden file handling #4655
 2016-04-12 17:14:47 +02:00
Klaas Freitag bf99306a53 Merge branch 'do_not_close_db_on_done' 2016-04-12 14:36:46 +02:00
Klaas Freitag 868edb1f0d SyncJournalDb: Only close the db if the return code is not SQLITE_DONE 
SQLITE_DONE is the indicator for not more query results, which is a legal
thing and not an error condition.

Also, check _getFileRecordQuery for null pointer, as close() wipes it.
 2016-04-11 17:38:16 +02:00
Klaas Freitag aaf43bd0d3 SyncJournalDb: Handle empty filename and avoid a bogus db query. 2016-04-11 17:36:15 +02:00
Klaas Freitag d5f1d1c6b2 SqlQuery: Add method errorId() to get the numeric error code. 2016-04-11 17:34:59 +02:00
Klaas Freitag 6cb94e8849 Merge pull request #4656 from owncloud/close_journal_fix 
Close journal fix - do not keep the journal open or reopen on error.
 2016-04-11 16:14:17 +02:00
Klaas Freitag d433c24186 Check if the record returned from getFileRecord is valid. 
Handle database fails properly.
 2016-04-11 16:04:20 +02:00
Klaas Freitag e896d16f32 ActivityWidget: Make sure Notification are visible if Activity disabled 
This is the fix for #4651
 2016-04-11 15:39:25 +02:00
Klaas Freitag 2ec642aadb ActivityWidget: Properly set widget for the Scrollview. 
Also fixed some SizePolicy settings.
 2016-04-11 15:38:25 +02:00
Klaas Freitag 648328fbe2 SyncJournalDb: Close the db on error in getFileRecord() 
The idea is that the next call to any database operation will try to
reopen the database through the checkConnect() method. So even if there
was a disconnect trom the db file, this will reestablish the connection.
 2016-04-11 12:40:19 +02:00
Klaas Freitag ee58cc3b66 SyncEngine: Close the sync journal after the sync run has finished. 2016-04-11 11:31:54 +02:00
Klaas Freitag 8f7b833c12 Not Synced Tab: Use tr rather than string concat 2016-04-07 09:18:51 +02:00
Klaas Freitag 48bfcde97d Merge pull request #4640 from owncloud/numberInProtocolTab 
ProtocolWidget: Show number of non synced files in tab label.
 2016-04-07 09:15:06 +02:00
Klaas Freitag 42439490cc Merge pull request #4645 from owncloud/fix_4633 
SelectiveSync: Verify if the list could be read from journal.

If not handle the error rather than assuming the selective sync list is empty.
 2016-04-07 09:14:33 +02:00
Klaas Freitag 058cd33324 Not Synced: Display only the number of not synced items in parathesis. 
This was Jans wish.
 2016-04-06 17:53:42 +02:00
Klaas Freitag e4604b406f SyncEngine: finalize properly on error with syncjournal 2016-04-06 17:20:48 +02:00
Klaas Freitag 7b1f02fcda SelectiveSync: Verify if the list could be read from journal. 
If there is a read error from the database while trying to get
the list from database, make sure to not behave badly because
the list is empty.
 2016-04-06 15:01:28 +02:00
Klaas Freitag 52a5234122 Merge pull request #4641 from owncloud/bubbleUpConflicts 
Bubble up conflicts: Show a tray notification on conflicts and show the conflicts in the not-synced list.
 2016-04-06 13:45:47 +02:00
Klaas Freitag 4e17dabcb6 Folder: Fixed a couple of plural translation issues. 2016-04-06 12:22:29 +02:00
Klaas Freitag 9bdc84c6f4 NotificationJobs: Set ocs header to maintain the session. 
This is needed by the server.
 2016-04-05 16:52:51 +02:00
Klaas Freitag 252aea25da ProgressDispatcher: Improve wording about conflicts. 2016-04-05 16:38:18 +02:00
Klaas Freitag efb0faa14e Folder: After sync, fire up tray notification if conflicts happened. 
If there were conflicts, users want to have a tray notification that warn
about.
This will help for #3222
 2016-04-05 16:37:54 +02:00
Klaas Freitag 5b40921587 ProtocolWidget: Show number of non synced files in tab label. 2016-04-05 13:57:38 +02:00
Klaas Freitag 7994b3d91a ProtocolWidget: handle Conflicts as not-synced items 2016-04-05 11:13:12 +02:00
Klaas Freitag 73e2a503d7 NotificationWidget: Some ui refinements. 2016-04-04 12:46:00 +02:00
Klaas Freitag bc6eebddf4 NotificationWidget: Handle empty message and subject properly. 2016-04-04 12:45:39 +02:00
Klaas Freitag 6b0d535120 Merge branch 'notifications' 2016-04-04 10:40:33 +02:00
Klaas Freitag 885f8b382f ActivityWidget: Handle plural properly in translations. 
Even for the case where the number is fixed.
Also fix the translators comments.
 2016-03-29 18:01:54 +02:00
Klaas Freitag 8166c52f4a NotificationHandling: Use QByteArray for the verb. 2016-03-29 18:01:49 +02:00
Klaas Freitag cd3f612857 ActivityWidget: Rename blacklistActivities to blacklistNotifications. 2016-03-29 16:50:58 +02:00
Klaas Freitag 2e30a0e5bc Remove superflous iterator increment 2016-03-29 16:50:15 +02:00
Klaas Freitag 9f438cb768 Doc: Add milliseconds unit to notificationRefreshInterval doc 2016-03-29 14:39:12 +02:00
Klaas Freitag cacb751ab8 Cleaups based on review feedback. 2016-03-29 14:38:11 +02:00