Nicholas D Steeves
6d8fa21572
Fix typo in backend
...
Bug: 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929 394929
2018-06-02 20:22:29 +02:00
Albert Astals Cid
17b304c42a
Do not call deleteLater on a null QObject
...
We don't always have a pairing handler for a given device link
Also change the assert not to trigger a warning in ubsan
Reviewed by Albert Vaca
2018-03-24 19:02:06 +01:00
Albert Vaca
f47f517827
Rename NetworkPackage -> NetworkPacket
...
Summary: KDE Connect, now with correct naming!
Test Plan: It still builds.
Reviewers: #kde_connect, apol, nicolasfella
Reviewed By: #kde_connect, apol, nicolasfella
Subscribers: nicolasfella
Differential Revision: https://phabricator.kde.org/D11036
2018-03-05 20:03:23 +01:00
Tobias Fella
2aeae44569
Fixed Typo
...
Reviewers: #kde_connect, nicolasfella
Reviewed By: #kde_connect, nicolasfella
Subscribers: nicolasfella, #kde_connect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D10998
2018-03-03 20:31:21 +01:00
Matthijs Tijink
d6f9c30749
Add support for new Android 2.3 (API 9+) cipher
...
Summary: Desktop counterpart of D9449.
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Differential Revision: https://phabricator.kde.org/D9451
2017-12-22 13:27:04 +01:00
Albert Vaca
84bba9429f
Merge branch 'master' into 1.x
...
# Conflicts:
# core/backends/lan/downloadjob.cpp
# core/backends/lan/downloadjob.h
# core/filetransferjob.cpp
# core/filetransferjob.h
# plugins/notifications/sendreplydialog.cpp
# plugins/notifications/sendreplydialog.h
# plugins/telephony/sendsmsdialog.cpp
# plugins/telephony/sendsmsdialog.h
2017-09-03 22:05:54 +02:00
Jean Vincent
72535ecf48
Make member variable names, & placement and * placement more coherent
...
Summary:
Change all member variables to the form m_fooBar because it is the preferred form in Qt (it was half and half between this and mFooBar, and a minority didn't have anything).
Place all references and pointers on the side of the type since it is the majority.
Basically:
- mFoo -> m_foo
- foo -> m_foo (if it is a member variable)
- Type &ref -> Type& ref
- Type *ptr -> Type* ptr
Reviewers: #kde_connect, nicolasfella, albertvaka
Reviewed By: #kde_connect, nicolasfella, albertvaka
Subscribers: albertvaka, #kde_connect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D7312
2017-09-03 21:45:08 +02:00
Albert Astals Cid
d1d84bc464
Fix DownloadJob not finishing
...
We stop using a buffer so it's less memory intensive and allows for larger files to be sent.
With current KIO has CPU usage issues, there's a patch in review that fixes them.
BUGS: 378488
2017-08-02 00:39:19 +02:00
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
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
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
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
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
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
Albert Vaca
b67761a442
Remove debug messages
2017-07-14 00:32:40 +02:00
Aleix Pol
29888cb78b
Improve debug information
...
If we're ignoring an ssl issue, at least show it.
On connected show whether the socket is valid, otherwise we get remote
devices disconnected without any message. (In this case HostNameMismatch)
Also fixes a typo
CCBUG: 381542
2017-07-07 17:26:55 +02:00
Albert Vaca
34d419756b
Merge branch '1.x'
2017-04-13 21:23:29 +02:00
Albert Vaca
a4f2a60d47
Do not use the default proxy.
...
Qt uses the system proxy if set up, explicitly disable it.
BUG: 376187
2017-03-06 22:02:08 +01:00
Albert Vaca
1b308a547d
Fix warning because of missing enum value in switch
2017-02-18 15:32:55 +01:00
Albert Vaca
2c1c8525e5
Now a 100% more compiling
2017-02-14 23:03:59 +01:00
Albert Vaca
25e0cea373
Make error message reflect the actual ports we use
2017-02-14 22:52:37 +01:00
Albert Vaca
f0a96a3ab9
Do not error if we try to request pair again
2017-02-10 00:54:03 +01:00
Albert Vaca
7e63a90da6
Merge branch '1.x'
...
# Conflicts:
# app/org.kde.kdeconnect.app.desktop
# plugins/kdeconnect.notifyrc
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
2017-02-05 16:12:25 +01:00
Albert Vaca
12a3027be6
Wrong order, condition was always false.
2017-02-05 16:08:20 +01:00
Aleix Pol
5d088041c0
Don't leak pairing handlers
2017-01-25 01:16:07 +01:00
Aleix Pol
ea41d3786e
Expose pairing state for devices
...
Will allow to have information about whether we're pairing, mostly for
better GUI.
Pair-programmed with Albert Vaca
2017-01-25 00:22:22 +01:00
Holger Kaelberer
a75e0ba031
Make pairing notifications more persistent
...
Notifications are not persistent, and once gone there is no
way to accept the request. Clicking the notification in the
notification history does nothing in plasma and gnome.
There make them persistent and close them after the pairing timeout,
after which they are no longer useful.
BUG: https://phabricator.kde.org/T5002
2017-01-05 19:11:55 +01:00
Albert Vaca
beeae63086
Missing Q_OBJECT macro
2016-11-26 16:36:34 +01:00
Albert Vaca
60331ccbf1
Clazy says all this QStringLiteral and QLatin1String were missing/wrong
2016-11-26 16:21:29 +01:00
Albert Vaca
a1340c8042
Fixed old style connects with clazy
2016-11-26 15:14:19 +01:00
Albert Vaca
f845b33392
Fixed bug on Windows
2016-11-20 04:25:11 +01:00
Albert Vaca
c9cfac7253
Remove debug logs
2016-08-29 11:00:35 +02:00
Aleix Pol
0774020899
Merge branch '1.0' into 1.x
2016-08-14 21:15:13 +02:00
Aleix Pol
91f952f5f1
Fix test
...
Use the right port
Store the port in a public variable, so it can be used from the test.
2016-08-08 19:38:58 +02:00
Albert Vaca
50496a3442
Reverted change that introduced a crash.
...
If there are ssl erros with unpaired devices, link was null.
This reverts commit 7da30ddbb1
.
2016-08-03 22:01:04 +02:00
Albert Vaca
2cdf7d5499
Reduced logging
2016-07-12 12:49:21 +02:00
Albert Vaca
f41877fbec
Disabled removing links when exiting discovery mode because it was broken.
...
If both devices are in "discovery mode" (ie: both want to keep links
established) and the last one to create the link goes out of discovery
mode, it will close the link when it shouldn't (because the other end still
was "using" it to display it to the user).
2016-07-12 12:38:40 +02:00
Albert Vaca
7da30ddbb1
Use the pairing handler instead of accessing the device directly on error
2016-07-12 12:34:56 +02:00
Albert Vaca
5933c6810c
More unused includes cleanup
2016-07-05 14:27:53 +02:00
Albert Vaca
7c0fbbc034
Unused include cleanup
2016-07-05 14:13:48 +02:00
Albert Vaca
9c736583e2
Use the actual connection origin, so we don't keep all connections open.
2016-07-05 12:42:39 +02:00
Aleix Pol
2b451097eb
Make sure errors get reported
2016-07-05 01:00:02 +02:00
Albert Vaca
385bf77480
Fixed bug which didn't allow to pair a new device
2016-07-04 19:52:37 +02:00
Aleix Pol
359194c2ed
Use initializers to construct it
2016-07-04 19:18:13 +02:00
Albert Vaca
04713de718
Remove qdebugs
2016-06-26 15:48:37 +02:00
Aleix Pol
ef98fb4587
Fix file transfer under SSL
...
Introduces a big fat buffer :(
Actually test the trasfers :)
Takes QSslSocket causistic into account, for some reason QNAM refuses to
mark as finished when the QSslSocket (through QIODevice) closes.
It would be good to look into dropping the QBuffer, doing so with the test
in place will help.
2016-06-22 17:49:45 +02:00
Albert Vaca
01139d31d1
De-duplicated socket SSL configuration code
2016-06-22 14:27:09 +02:00
Aleix Pol
4cb50d69d8
Fix some issues in the downloadjob and its test
...
Test on KJob abstraction, this way we can check if it has an error when it
breaks.
Handle errors in a different branch of the code.
2016-06-22 12:40:14 +02:00
Aleix Pol
f9406e8afc
Introduce QVariantMap as an argument of NetworkPackage
...
Makes it possible to specify the different properties sent at once,
rather than one by one as we used to do.
Also port whenever possible to the initializer-list syntax.
REVIEW: 128269
2016-06-21 20:07:12 +02:00
Albert Vaca
e880e14ed5
Preffer Q_FOREACH to foreach
2016-06-21 14:50:17 +02:00
Albert Vaca
5abd081b85
Changed port so we don't conflict with Houdini
2016-06-21 14:42:32 +02:00
Aleix Pol
596e4484f4
Clean up use of virtual and override keywords
...
Only use virtual when actually virtual, to override just use override.
2016-06-20 19:22:29 +02:00
Albert Vaca
c4d7c2f39b
Improved comments
2016-06-17 02:00:23 +02:00
Albert Vaca
e379fcd69d
Destroying a socket should not destroy the link.
...
Also, sockets can be destroyed as soon as the socketreader is deleted.
2016-06-17 02:00:23 +02:00
Albert Vaca
91c23dfdea
Do not compare against the current version of the protocol
2016-06-16 19:48:23 +02:00
Albert Vaca
cb0fd1fe20
Removed a case where we would still add a link on old protocol versions
2016-06-15 20:38:57 +02:00
Aleix Pol
5715926c5c
Export the symbols needed by the tests
2016-06-10 15:07:33 +02:00
Albert Vaca
3177143439
Fixed build on windows
2016-06-09 02:36:02 +02:00
Albert Vaca
1c315af108
Revert "Fix file transfers"
...
This reverts commit 252ea4ba20
.
2016-06-07 00:28:52 +02:00
Aleix Pol
751bd5849b
small style changes
2016-06-06 01:21:37 +02:00
Frederik Schwarzer
a594324d4f
Fix message wording.
2016-06-03 21:33:25 +02:00
Aleix Pol
252ea4ba20
Fix file transfers
2016-06-03 16:38:04 +02:00
Albert Vaca
7a0bb09353
Make sure we don't broadcast more than once at the same time.
...
Race conditions might happen because two links will be created.
2016-06-02 12:18:51 +02:00
Albert Vaca
7a67274a18
Fixed memory leak.
2016-06-02 12:17:07 +02:00
Albert Vaca
5654300249
Removed logs
2016-05-31 20:09:52 +02:00
Vineet Garg
b96227ae75
Changed protocol version to TLS 1.0, as TLS 1.2 not supported on many Android device
...
Choosing cipher suites manually, same as of Android
2016-04-30 20:39:34 +05:30
David Kahles
abc5fa3c56
Remove second UDP socket in LanLinkProvider
...
We don't need two sockets for reading and writing.
REVIEW: 127769
2016-04-28 00:19:20 +02:00
Albert Vaca
78d4ba2106
Cleanup
2016-03-08 07:29:34 -08:00
Albert Vaca
ff9775e1c9
Better logging of what's going on
2016-03-07 16:01:44 -08:00
Albert Vaca
8f9fde8f40
Fixed crash when pairing old Android apps.
2016-03-02 16:38:03 -08:00
Albert Vaca
ebd429629a
Fixed unpairs never being sent
2016-03-02 16:17:38 -08:00
Albert Vaca
ea812f1101
Attribute not needed
2016-03-02 15:50:06 -08:00
Albert Vaca
90d2b0ad69
Changing TLS version to what is used in LanLinkProvider.
...
Android<16 doesn't support TLS>1.0
2016-02-12 09:02:56 -08:00
Albert Vaca
aa4150f0c9
Moved ConnectionStarted from DeviceLink to LanDeviceLink
2016-01-10 07:12:13 -08:00
Albert Vaca
2aca5ca11e
Added error message when trying to pair older devices
2015-12-17 09:24:34 -08:00
Aleix Pol
8a019ccddf
Fix assert
2015-12-17 17:58:33 +01:00
Albert Vaca
7ed012e4a5
Fixed broadcast
2015-12-17 08:59:08 -08:00
Albert Vaca
f5404ea11b
Removed more references to publicKey
2015-12-17 08:22:18 -08:00
Albert Vaca
918bb82ffa
Do not store certificate and key in landevicelink
...
The socket already stores the certificate, and the public key is only used
in the sftp plugin, so it should be moved there or dropped.
2015-12-17 07:46:13 -08:00
Albert Vaca
4c84499e6a
Don't addLink twice for the same link
2015-12-17 07:44:29 -08:00
Albert Vaca
dd7d4093ed
Removed sendPackageEncrypted from DeviceLink
2015-12-17 07:43:52 -08:00
Albert Vaca
d37830b429
Simplified pairing logic
2015-12-17 06:54:29 -08:00
Albert Vaca
10b4ca00fb
Set certificate in outgoing pairing packet
2015-12-17 06:53:57 -08:00
Albert Vaca
af43a21864
Propagate pairingError
2015-12-17 06:53:29 -08:00
Albert Vaca
49a24c258b
Fixed crash
2015-12-17 05:54:24 -08:00
Albert Vaca
813c9fedb3
Calling setDeviceLink in pairing handler is not required anymore
...
Since we re-use the same device link object forever now
2015-12-17 04:41:53 -08:00
Albert Vaca
ddca4d6d63
Store and restore certificate and public key in lan link
2015-12-17 04:41:10 -08:00
Albert Vaca
79a8103120
Added some asserts
2015-12-10 19:06:55 -08:00
Albert Vaca
2e4c3762e9
Re-use landevicelink objects instead of re-creating one each time
2015-12-10 17:11:48 -08:00
Albert Vaca
2e4ce90656
Commented out old encryption functions
2015-12-07 03:34:41 -08:00
Aleix Pol
d69cdce4c1
Make sure incoming Lan pair packages are processed by the LanPairHandler
2015-12-06 02:12:29 +01:00
Aleix Pol
7041c72aed
Fix connect
2015-12-06 02:11:50 +01:00
Aleix Pol
e10b2e80c9
Propagate pairing errors
2015-12-06 01:51:53 +01:00
Aleix Pol
90c8f588bc
Only respond to local broadcasts
2015-12-06 01:19:55 +01:00
Aleix Pol
69d899ed48
Only broadcast when the newly reported configuration is actually active
2015-12-06 01:19:20 +01:00
Albert Vaca
03926cc3bf
WIPx4
2015-12-02 11:04:35 -08:00
Albert Vaca
af5be6e9e0
Added a test mode to lanlinkprovider
...
Should fix tests when you run them on networks with real kdeconnects
running.
2015-12-02 09:49:00 -08:00
Albert Vaca
cf6cbd2925
WIPx3!
2015-12-01 10:45:14 -08:00