chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-21 15:46:15 +02:00
Code Activity
7,272 Commits 4 Branches 173 Tags
v1.8.0-beta1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Goffart a7c97388a9 Fix Qt4 build for another error 2015-02-12 20:16:02 +01:00
Olivier Goffart 86c480ee09 Fix Qt4 build 2015-02-12 20:10:31 +01:00
Olivier Goffart 0184a00151 PropagateDirectory: make the code a bit more readable 
Do not call slotSubJobFinished when there is are no sub jobs because
no sub jobs were finished.  Instead just call a finalize method
 2015-02-12 20:00:04 +01:00
Olivier Goffart b9161aa06c libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed 
The problem occurs because of the sorting of items when we have things like

bigfolder
bigfolder/bigsubfolder
bigfolder-2

Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content
and the propagator would thinkg bigfolder is empty and save the etag before it is processed

Should fix issue #2832
 2015-02-12 20:00:04 +01:00
Olivier Goffart 063271e978 propagateupload: Disable parallel chunk upload for owncloud < 8 
Issue #2743
 2015-02-12 14:50:42 +01:00
Olivier Goffart 438c4fe72e Account: put the server version in the account 2015-02-12 14:50:42 +01:00
Olivier Goffart 4f202e5f4c Fix TokenCredentials compilation 2015-02-11 18:10:01 +01:00
Olivier Goffart 51337a10af LSCOL job: Fix getting the list of folders when there are non-ascii 
Task #2795
 2015-02-08 12:23:47 +01:00
Olivier Goffart eedb5d0dae Revert "cmake: Clearly Define qtmain.lib link policy on Windows" 
It make jenkins fail with the error:

CMake Error at CMakeLists.txt:3 (cmake_policy):
  Policy "CMP0020" is not known to this version of CMake.

This reverts commit 6d380c8548.
 2015-02-06 17:46:57 +01:00
Olivier Goffart 6e8527e66d Wizard: Show the remote folder name when the theme has one 
Relates to issue #2788
 2015-02-06 14:50:52 +01:00
Olivier Goffart 70c8803a79 SelectiveSync: show a message in case of error or if there is no subfolder 
Usefull when the folder does not exist (for example in case the theme
has a defaultServerFolder that does not yet exist, #2788)

But also to avoid confusion (issue #2663)
 2015-02-06 12:27:54 +01:00
Olivier Goffart 0d2fb0754c Wizard: Fix the advanced setup page when the theme has a defaultServerFolder 
Especially the selective sync dialog

Task #2788
 2015-02-06 12:27:54 +01:00
Olivier Goffart 2a88f5083c t6.pl: Add a test that re-upload a chunked file with lot of chunks 2015-02-06 10:23:20 +01:00
Olivier Goffart 5ec793e045 propagateupload: Save the mtime given by the server in the reply to GET 
There could be a race condition if the file was updated on the server
between the discovery and the propagate phase. By taking the mtime from
the server, we make sure that we do not have a race.

This is tested by t6.pl with BIG3.file because the script was modifying
the file between the two phases
 2015-02-06 10:23:20 +01:00
Olivier Goffart 3169a6f170 SelectiveSync: change the wording of the dialog on the wizard 
Have different wording depending on the wizardSelectiveSyncDefaultNothing theme option

Relates to #2580
 2015-02-05 16:22:04 +01:00
Olivier Goffart 856df4c5f6 libsync: Get the capabilities and store it in the account 2015-02-05 15:42:56 +01:00
Olivier Goffart 34237f604e JsonApiJob: Refactor out of the shibbolethuserjob 2015-02-05 15:42:01 +01:00
Olivier Goffart 21345b81f1 wizard: fix the EntityExistJob URL 
We need to add the davPath in there.
Otherwise there will be a redirect which will break shiboleth
(We want to only enter the password once)

Issue #2739 and #2780
 2015-02-05 12:53:04 +01:00
Olivier Goffart 3dd8ce08b8 Parallel chunk upload: Fix a off-by-one while saving the done chunk in the DB 
We should assume that the chunk currently uploading is NOT done (hence the -1)

il task 405
 2015-02-04 18:52:26 +01:00
Olivier Goffart 11f1229c31 Fix Qt4 build 2015-02-04 18:04:50 +01:00
Olivier Goffart ca56e5d9ca SyncEngine: Fix crash 
We must check if 'it' is not == to begin() before doing it-1
Also i believe the logic was reversed if it was begin()

Task #2765
 2015-02-04 14:52:41 +01:00
Olivier Goffart 68ec24797b Add some define. 
Since Qt5.4, on release build, qDebug do not provide anymore the line
number unless we define QT_MESSAGELOGCONTEXT

Also define QT_USE_QSTRINGBUILDER while i'm on it (free optimisation)
 2015-02-04 13:43:02 +01:00
Olivier Goffart 26132fd14e owncloudconnectionmethoddialog: typo 2015-02-04 13:42:49 +01:00
Olivier Goffart ca68ccd76a Fix Qt4 build 2015-02-03 20:04:04 +01:00
Olivier Goffart 1f9d7c41e8 owncloudconnectionmethoddialog: Change order of buttons, fix wording, and add the URL 2015-02-03 17:55:01 +01:00
Olivier Goffart 52d330d8e5 csync: add neon include directories 2015-02-03 16:00:55 +01:00
Olivier Goffart db6214e090 SyncEngine: Do not assert when the neon session is 0 
It can now be 0 if neon is not in used

Issue #2755
 2015-01-30 01:05:46 +01:00
Olivier Goffart 22d3a4a48f csync_owncloud: don't deref null pointer 2015-01-28 14:16:33 +01:00
Olivier Goffart d70e146c1f Merge remote-tracking branch 'origin/ssl_client_cert' 
Conflicts:
	CMakeLists.txt
	csync/src/CMakeLists.txt
	csync/src/csync_owncloud.c
 2015-01-28 14:13:40 +01:00
Olivier Goffart b0dbb49ca8 Shib: fix broken signal/slot connections 2015-01-26 16:23:43 +01:00
Olivier Goffart 3169833cd7 gui: Still give a decent experience if there is no system tray 
Helps for tasks #1138, #2023, #2123
 2015-01-26 13:00:45 +01:00
Olivier Goffart fb79211514 Merge remote-tracking branch 'remotes/origin/win_context_menu' 2015-01-23 18:02:55 +01:00
Olivier Goffart 502e7081cf Make it compile with neon 2015-01-23 17:59:07 +01:00
Olivier Goffart dcba129a98 Make it compile without neon 2015-01-23 17:56:46 +01:00
Olivier Goffart b856266e91 Remove neon link flag when not required 2015-01-23 17:35:17 +01:00
Olivier Goffart fe51ada1e8 Don't require NEON with Qt 5.4 2015-01-23 17:11:34 +01:00
Olivier Goffart a999884adf osx integration: adapt to socket api changes 2015-01-23 16:13:16 +01:00
Olivier Goffart 807277c0ae Socket API: Do not broadcast the shared menu entry on all socket when one connects to the socket API 
Now we reply to the command SHARE_MENU_TITLE
 2015-01-23 16:09:38 +01:00
Olivier Goffart 0af97156c9 Windows shell integration: Make the share entry work by adding a Sleep 
Timeouts don't work with named pipe, so wait for 50ms to let time
for the client to answer
 2015-01-23 15:43:03 +01:00
Olivier Goffart 560759ede8 Windows shell integration: Reduce the timeout time of WaitNamedPipe 
This is maybe what causes the troubles of task #2576
 2015-01-22 16:30:02 +01:00
Olivier Goffart 0f98a90858 Wizard: Add an option in the theme to default to nothing selected in the selective sync 
Issue #2580
 2015-01-22 15:57:55 +01:00
Olivier Goffart 3c26bfa618 Propagate Remote mkdir: save the fileid to the database early 
It's important so that if we delete or rename  a diectory that is being
uploaded, this is properly detected
 2015-01-22 15:11:04 +01:00
Olivier Goffart 168c89aba7 Wizard: fix spacing 2015-01-22 15:11:03 +01:00
Olivier Goffart 5860e5a46b Exclude *.tmp (as requested in #2424 ) 2015-01-22 14:08:31 +01:00
Olivier Goffart f2a7e0b28f Selective sync dialog: give a proper size by default 2015-01-21 15:37:00 +01:00
Olivier Goffart 0e86ceff73 Connection Validator: let the user cancel the password dialog 
And don't ask for the password again if this happens
 2015-01-21 15:33:51 +01:00
Olivier Goffart c91de092e5 Setup wizard: Fix the http fallback logic 
Also don't allow to go back from the advanced settings page because
this break everything
 2015-01-21 15:33:51 +01:00
Olivier Goffart d8b621d05f LsColJob: fix getting the sizes when the path contains %-encoded chars 2015-01-21 12:04:54 +01:00
Olivier Goffart 5c2298fa37 Discovery phase: fix a few warnings 2015-01-20 18:50:03 +01:00
Olivier Goffart 08043bed21 csync_update: Leave a margin of 1sec when comparing the time for the timezone changes 
Because FAT has a bad resolution, when the timezone is changed, there may be
one second of difference.

Issue #2438
 2015-01-20 18:34:24 +01:00
Olivier Goffart 22ad34fa0e Merge branch '1.7' 
Conflicts:
	admin/win/nsi/l10n/French.nsh
	src/mirall/propagator_qnam.cpp
 2015-01-15 17:58:43 +01:00
Olivier Goffart ce0e7e4a5d Propagator download: Do not assume the server do not support ranges if we cannot parse the Content-Range header 
There are several reason why start==0
* The Content-Range header was not present
* We can't parse it
* Or it is actually 0

If we can't parse it, we cannot assume anything and must error out.
So only in the first case we should discard the temporary file and continue.

Issue #2708
 2015-01-15 17:56:49 +01:00
Olivier Goffart 907b79d3b8 Utility: Use appropriate unit when converting from bytes to human readable units 
We must not use the SI units if we use power of 2

I believe that we should use SI units and power of 10
But since the server still use power of 2, we need to show the same numbers

But at least we use the proper standard IEC unit that are explicit
 2015-01-15 14:06:17 +01:00
Olivier Goffart 863731fd6a Revert "Utility: Use SI units" 
This reverts commit 7445fa7ef7.
and commit f654c53c35.

The server still use wrong powers, so we still need to use the same
 2015-01-15 13:56:51 +01:00
Olivier Goffart c9f1b3229b Add Folder Wizard: fix wording 
(Relates #2663)
 2015-01-15 13:55:48 +01:00
Olivier Goffart 2b8b204cfc SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error 2015-01-15 13:07:16 +01:00
Olivier Goffart 264471af43 csync: cleanup some unused error code 2015-01-15 12:19:06 +01:00
Olivier Goffart e31514f769 csync propfind: Rename the directDownload property 
The owncloud server has a different name because if it was named the same
it would break the 1.7 client

Issue #2614
 2015-01-15 11:52:55 +01:00
Olivier Goffart 08d3ae9f02 csync_statedb: Have more granular error reporting when the loaddb fails 
In order to distiguish error from sqlite_open or from the integrity check

Issue #2673
 2015-01-15 11:36:24 +01:00
Olivier Goffart f654c53c35 fixing testOctetsToString 2015-01-15 09:58:40 +01:00
Olivier Goffart ac0e8b1fe1 Qt 4 fix 2015-01-14 16:30:10 +01:00
Olivier Goffart da0f7317b4 Wizard: Show the size of the folders that will be downloaded 
Part of #2580
 2015-01-14 16:11:07 +01:00
Olivier Goffart 0ae9055ea6 Propagator upload: Fix UploadDevice::seek 2015-01-14 15:08:09 +01:00
Olivier Goffart 885aafcea3 SelectiveSync dialog: Show the sizes of the folder 2015-01-14 15:08:09 +01:00
Olivier Goffart 7445fa7ef7 Utility: Use SI units 2015-01-14 15:08:09 +01:00
Olivier Goffart 3ec19ee355 Propatage upload: Preload the chunk in memory and close the file 
This should solve #2675 and #1981

By preloading the chunks in memory before sending them, we don't keep the
file open and therefore we let other program open the file for writing.

If the file is modified between two chunks, we detect that and abort anyway
 2015-01-14 13:46:51 +01:00
Olivier Goffart 0215b250af UploadDevice: mark overrided method as Q_DECL_OVERRIDE 2015-01-14 13:46:51 +01:00
Olivier Goffart 6a0c9fdd34 Propagate upload: Change the default chunk size to 5MiB and make chunk upload parallel 
The server is slow to process each chunk. As a result the time between
the chunks is not neglectible. Therefore we gain a lot of time by
uploading the chunks in parallel. So the bandwitdh is used when the
server is waiting between chunks.
 2015-01-14 13:46:51 +01:00
Olivier Goffart 7f1593c5d7 PropagateUpload: The PUTJob owns the chunk device, so make it a QScopedPointer instead of a QSharedPointer 2015-01-14 13:46:51 +01:00
Olivier Goffart 7671ae8df7 Application: Initialize the folderman after we checked for existance 
So we don't start the SocketAPI if we are going to quit.
We also do not log any message anymore before we install the hooks

Should solve #2666
 2015-01-08 16:52:23 +01:00
Olivier Goffart bbf0e7c0a5 owncloudcmd: add --unsyncedfolders to test selective sync 2015-01-08 15:27:02 +01:00
Olivier Goffart 8e3dbcb7c0 SocketAPi: use absoluteFilePath unstead of canonicalFilePath 
Because canonicalFilePath is way too slow.

Issue #2671
 2015-01-07 14:37:05 +01:00
Olivier Goffart ab0bc75e43 PropagateUploadFileQNAM::slotUploadProgress: Fix inverted condition 
( Apply this commit 2d8053a9df )
 2015-01-05 17:32:12 +01:00
Olivier Goffart 2d8053a9df Dolphin plugin for KF5 2015-01-05 17:23:36 +01:00
Olivier Goffart 414ac5433d Merge branch '1.7' 
Conflicts:
	binary
	doc/accountsetup.rst
	doc/architecture.rst
	doc/navigating.rst
	doc/owncloudcmd.rst
	doc/troubleshooting.rst
 2015-01-05 14:40:53 +01:00
Olivier Goffart b2c01ffe21 SyncEngine: Show an error when a file name is not encoded with valid UTF-8 
... instead of uploading the file with replacement character, and asserting
on the next sync.

Issue #2649

If the file or folder on the file system has a name with invalid UTF-8,
We would convert the name to utf-8, and the conversion would result in
replacement character placeholder.  And we would upload that file on the server
with that name, and save it with this name on the database.
Fix this issue by showing an error to the user for invalid files.
 2015-01-05 13:54:31 +01:00
Olivier Goffart 517dea6958 accountsettings: Use right palette when using reversed palette 
Issue #2654

The problem is that the WindowsVistaStyle does something wierd with the palette
when drawing the text, and we should do the same then.
 2015-01-05 12:17:05 +01:00
Olivier Goffart e8efaa5ed8 Direct download URL: Fix resuming 
The server might support resuming, so don't always erase the temporary file
and pass the startSize, so the temporary file will be remove if the server
does not support it after all (because it is not sending the "bytes" header

Also pass the expected etag for consistency even if it's not used in this case.
 2014-12-18 12:13:12 +01:00
Olivier Goffart 96872e2b3b Download: When direct URL don't work, retry through webdav 2014-12-17 14:28:13 +01:00
Olivier Goffart a2803e4f5f csync_update: do not force writing on the db for directory with a changed date 
Fixes #2584
 2014-12-16 13:02:32 +01:00
Olivier Goffart b1d392e415 Download job: allow redirect on direct download link 
Issue #2614
 2014-12-16 11:51:25 +01:00
Olivier Goffart cbf00e9378 Connection Validator: Fix connection warning 
The timeout signal does not exist.
Timeout is handled as a normal network arror.
 2014-12-16 11:48:15 +01:00
Olivier Goffart 414838cae8 Settings dialog: remove the code that was updating the account icon 
I just wanted to fix the warning:
 QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108

It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
 2014-12-16 11:36:52 +01:00
Olivier Goffart 3ee14164db network jobs: Refactor the redirect handling in AbdtractNetworkJob 
Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can
later use it in any job  (in preparation for task #2614)
 2014-12-16 11:27:02 +01:00
Olivier Goffart a3e7f513e6 SocketAPI: use the canonical path 
Issue #2591
 2014-12-09 20:48:51 +01:00
Olivier Goffart 441b5bd1dc Setup Wizard: remove all folder definition before starting a new sync 
Issue #1989
 2014-12-04 15:18:27 +01:00
Olivier Goffart a23e0fef8d Update binary submodule 2014-12-03 11:18:01 +01:00
Olivier Goffart 0fd0b08c09 Windows shell integration: Always release the lock before calling win32 API 
May help for 2515
 2014-12-03 09:11:38 +01:00
Olivier Goffart 8fbb55a0c8 Wizard: Fix escaping of error message. 
An url can contains % signs, so if it does, the errors formating was wrong
because of the use of QString::args

Also, the error is in html format, and we need to let the message box know
that, otherwise we will just see <br/>
 2014-12-02 10:22:46 +01:00
Olivier Goffart f046a7e7fe Wizard: Attempts to really close the database when starting the backup 
Still for issue #1989
 2014-12-02 10:22:46 +01:00
Olivier Goffart fb3f5d86cf Fix compilation after merge 2014-12-01 14:41:39 +01:00
Olivier Goffart 512492bf30 Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/libsync/propagatedownload.cpp
 2014-12-01 14:37:47 +01:00
Olivier Goffart 2477c3914e csync_update: Ignore a difference of time of exactly one hour 
Issue #2438
 2014-12-01 13:53:30 +01:00
Olivier Goffart 3253cc38b2 Propagator upload: Mark error while opening the file as SoftError 
Because otherwise a lot of error are shown to the user when
the user deletes a directory that is syncing

Task #1981
 2014-12-01 12:22:52 +01:00
Olivier Goffart b154e1baa1 Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined 
Same fallback as in Qt5

Task #2477
 2014-12-01 12:06:09 +01:00
Olivier Goffart fc3a8b944e Propagator: Don't forget to mark the direcotry as finished if its first job fails 
Otherwise we would go ahead and propagate the content of the directory
 2014-11-27 15:36:13 +01:00
Olivier Goffart 2ed2ef3b28 Propagator QNAM: Fix resuming 
We forgot to account the fact that we could have been resuming when
comparing the size of the Content-lenght to the size of the temporary file
 2014-11-27 14:50:49 +01:00
Olivier Goffart e7e91b6931 Revert "Folder: Don't blindly trigger sync on first EtagJob result" 
We need to do a sync even if the etag was empty because we do not know
if this is because the etag really changed or because it was new.

Also, some part of the code rely on this fact to schedule a sync.

The fact that there is two sync with 30 sec at the beginning is not
a big problem, because we also need to do the sync the put the directory
etag in the db.

This reverts commit 1c001ee138.
 2014-11-27 12:50:36 +01:00
Olivier Goffart 1f9d02e7fa Shibboleth: Fix our implemtnation of CookieJar::deleteCookie 
It was deleting too many cookies.
That function is virtual in Qt5 and is used when adding cookie.
But some Shibboleth have several cookies with the same name, and we need to keep them.

Our implementaiton was meant to delete all the shiboleth cookies when we want to log out
 2014-11-27 12:26:59 +01:00
Olivier Goffart c9c1547813 Compile with Qt4 
(QSharedPointer::reset is only in Qt5)
 2014-11-25 16:24:47 +01:00