Commit graph

1908 commits

Author SHA1 Message Date
Aleix Pol
2b17d89fc1 Revert "No need to use a QBuffer in DownloadJob"
We need to wait for KF5 release, I didn't mean to commit it

This reverts commit af778b71b1.
2017-08-01 22:46:38 +02:00
Aleix Pol
d61d52ac1f Fix reported file transfer speed
Don't mix milliseconds and seconds
Start calculating in the beginning
Output the requested file size
2017-08-01 22:45:28 +02:00
Albert Astals Cid
af778b71b1 No need to use a QBuffer in DownloadJob
Summary:
QSslSocket is already a QIODevice so just use that.

Should fix the issue of transfering *big* files.

Unfortunately this seems to trigger a bug in KIO and CPU usage goes through the roof, so haven't really been able to test it does actually fix things.

Please don't merge/approve yet

Reviewers: apol, albertvaka, kdeconnect

Subscribers: #kde_connect

Differential Revision: https://phabricator.kde.org/D6039
2017-08-01 21:03:55 +02:00
l10n daemon script
473a6c14ac SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-30 04:49:43 +02:00
l10n daemon script
456226cb16 GIT_SILENT made messages (after extraction) 2017-07-30 03:16:20 +02:00
Nicolas Fella
66e5eefe20 Gave plasmoid some love
Summary:
Make the plasmoid content transparent
Include battery info in header
Only show remotekeyboard input if available
Make header always centered

before:
{F3820966}

after:
{F3820965}

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: jeanv, albertvaka, apol, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D6943
2017-07-27 17:15:07 +02:00
l10n daemon script
08f31736ad SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-26 10:23:47 +02:00
l10n daemon script
baf2f9411c GIT_SILENT made messages (after extraction) 2017-07-26 09:27:38 +02:00
l10n daemon script
c01c11a230 GIT_SILENT made messages (after extraction) 2017-07-26 06:53:28 +02:00
Albert Vaca
7907f41cc0 Triggers a bug -> fixes a bug
lol
2017-07-26 00:10:10 +02:00
Albert Vaca
aec736fe56 Fix file corruption bug on SFTP plugin 2017-07-25 15:20:11 +02:00
l10n daemon script
66e77997d6 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-25 06:09:45 +02:00
Albert Vaca
ef0e80c91f Merge branch 'master' into 1.x
# Conflicts:
#	indicator/org.kde.kdeconnect.nonplasma.desktop
#	org.kde.kdeconnect.kcm.appdata.xml
#	plugins/runcommand/kdeconnect_runcommand.json
#	urlhandler/org.kde.kdeconnect.telhandler.desktop
2017-07-24 16:49:06 +02:00
Albert Vaca
3dd7144e21 qDebug -> qCInfo 2017-07-24 16:47:21 +02:00
Albert Vaca
8beaf6547f Revert "Previous commit makes us depend on Qt 5.8"
This was not true.

This reverts commit 874bb428fa.
2017-07-24 16:16:30 +02:00
l10n daemon script
470fdfef81 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-24 05:53:15 +02:00
l10n daemon script
2c9b1d9366 GIT_SILENT made messages (after extraction) 2017-07-24 05:07:51 +02:00
l10n daemon script
7ba311fc78 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-24 04:32:05 +02:00
l10n daemon script
9f313f94c2 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-23 05:44:59 +02:00
l10n daemon script
6d4bb21655 GIT_SILENT made messages (after extraction) 2017-07-23 05:05:10 +02:00
l10n daemon script
d276a7eb37 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-23 04:32:09 +02:00
l10n daemon script
61124cce62 GIT_SILENT made messages (after extraction) 2017-07-23 03:11:35 +02:00
Albert Vaca
874bb428fa Previous commit makes us depend on Qt 5.8 2017-07-22 11:29:25 +02:00
Albert Vaca
df61e8f0e6 Check if the IPv6 to v4 conversion succeeds, use v6 if it doesn't. 2017-07-22 11:25:07 +02:00
Jean Vincent
25b86c6c7f Determine which IP address to use for sshfs
Summary:
There is currently an issue where the device doesn't send the correct IP address for sshfs when a VPN is present.

Instead of asking the device to find and send its address, we can store it from when the device link is created then reuse it.

Test Plan:
All unit tests pass.

In these different situations:
  - without a VPN
  - with a VPN running
  - with a VPN started then stopped (the tun interface might still be there)
Try to remotely browse the device. It should work in all cases.

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: albertvaka, apol, nicolasfella, sredman

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D6730
2017-07-22 11:18:06 +02:00
Jean Vincent
c864267f04 Replace Q_FOREACH with C++11 range-for
Summary:
The use of Q_FOREACH is advised against (https://doc.qt.io/qt-5/qtglobal.html#Q_FOREACH) since Qt 5.7 and will eventually be removed from Qt.

I replaced all occurrences with the range-for loop introduced in C++11 (except for the one in daemon.cpp in deviceIdByName which might have a bug / typo in it).

I added const to the container or casted it with qAsConst when appropriate to avoid unnecessary copies.

(This is my first submission. I did all the unit tests, and they all passed but I don't know how to show it here.)

Reviewers: #kde_connect, nicolasfella, apol

Reviewed By: #kde_connect, nicolasfella, apol

Subscribers: albertvaka, apol, nicolasfella

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D6724
2017-07-21 09:57:19 +02:00
l10n daemon script
631880083d SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-19 09:50:22 +02:00
l10n daemon script
dbe288664c GIT_SILENT made messages (after extraction) 2017-07-19 09:09:03 +02:00
l10n daemon script
aa30780329 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-19 08:33:01 +02:00
l10n daemon script
93b9bee566 GIT_SILENT made messages (after extraction) 2017-07-19 06:41:09 +02:00
l10n daemon script
e6f3b5bd27 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-18 05:56:58 +02:00
l10n daemon script
6d4eecc3e1 GIT_SILENT made messages (after extraction) 2017-07-18 05:15:02 +02:00
l10n daemon script
d8c578edc9 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-17 06:00:54 +02:00
l10n daemon script
028c8d8695 GIT_SILENT made messages (after extraction) 2017-07-17 05:19:15 +02:00
l10n daemon script
322fcd47a5 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-16 06:03:07 +02:00
l10n daemon script
be30441da5 GIT_SILENT made messages (after extraction) 2017-07-16 05:21:28 +02:00
l10n daemon script
d513d9e37e SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-15 05:39:16 +02:00
l10n daemon script
e09da05dcc GIT_SILENT made messages (after extraction) 2017-07-15 04:59:40 +02:00
l10n daemon script
cc43a72884 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2017-07-14 05:43:50 +02:00
l10n daemon script
4d10aed047 GIT_SILENT made messages (after extraction) 2017-07-14 05:04:31 +02:00
Aleix Pol
d7ec24725f Make sure we keep track of changes when the device link changes
Especially useful because it contains the announce name.

CCBUG: 364150
2017-07-14 03:30:49 +02:00
Albert Vaca
43c3f411be Merge branch '1.x' 2017-07-14 02:18:40 +02:00
Albert Vaca
f7b2cee995 Remove debug message 2017-07-14 02:17:59 +02:00
Aleix Pol
27876542ab Unpair whenever there's a QSSLError 2017-07-14 02:17:59 +02:00
Aleix Pol
209e3e2842 Reflect property change when unpairing
There's no pairStatusChanged when the device is not connected to
anything (be it because it's unreachable at the moment).
2017-07-14 01:01:15 +02:00
Albert Vaca
b67761a442 Remove debug messages 2017-07-14 00:32:40 +02:00
Aleix Pol
bfaec96638 Unpair whenever there's a QSSLError 2017-07-14 00:23:37 +02:00
Albert Vaca
ebbf43f760 Coding style 2017-07-14 00:19:56 +02:00
Albert Vaca
83c250e9f1 Trust the name stored in the certificate
Having a separate copy of it in the config leads to them not being in sync

BUG: 381542
2017-07-14 00:19:26 +02:00
Fabian Vogt
0667c6556f Merge branch '1.x' 2017-07-12 11:37:41 +02:00