Aleix Pol
5e0a7a34b9
Merge branch 'master' into ssl
...
# Conflicts:
# cli/kdeconnect-cli.cpp
# core/backends/lan/landevicelink.cpp
# core/backends/lan/landevicelink.h
# core/backends/lan/lanlinkprovider.cpp
# core/backends/lan/lanlinkprovider.h
# core/backends/lan/socketlinereader.h
# core/backends/lan/uploadjob.cpp
# core/backends/lan/uploadjob.h
# core/backends/loopback/loopbackdevicelink.h
# core/daemon.cpp
# core/daemon.h
# core/device.cpp
# core/device.h
2015-09-11 17:25:23 +02:00
Patrick von Reth
da5c9bd30e
Fix compilation on Windows.
2015-09-10 15:51:38 +02:00
Aleix Pol
26b0ec8b98
Make sure we don't disconnect from discovering remotes
...
Otherwise it's hard to let other devices connect to us, without having both
devices in discoverability mode.
Reviewed by Albert Vaca
2015-09-09 13:01:38 +02:00
Aleix Pol
f65a1f206f
Turn core qWarnings into qCWarning
2015-09-07 19:35:07 +02:00
Vineet Garg
cf3d37b504
Fixed issue pointed out on RR
...
Fixed some pairing handler issues
2015-08-11 09:04:02 +05:30
Vineet Garg
27515546a0
Now per device per link type pairing handlers are there
2015-07-25 17:15:19 +05:30
Vineet Garg
e6da860fb7
Fixed issues pointed out on CR
2015-07-14 17:34:04 +05:30
Vineet Garg
8b0f06e484
Code cleanup, fixed socket deletelater issue
2015-07-08 00:22:10 +05:30
Vineet Garg
b6b5257ba4
Added ssl support in download job
2015-07-06 03:19:58 +05:30
Vineet Garg
0c110e4392
Added SSL encryption in file upload
...
DeviceId is used for peerVerifyName
2015-07-06 02:35:26 +05:30
Vineet Garg
148a713176
Initial working implementation of ssl
2015-07-05 18:53:53 +05:30
Albert Vaca
c7c1974ea9
Merge branch 'master' into frameworks
...
Conflicts:
core/backends/lan/lanlinkprovider.cpp
plugins/ping/pingplugin.h
plugins/telephony/telephonyplugin.cpp
2015-01-10 20:14:01 -08:00
Albert Vaca
4b6aa135e3
Fixing memory leaks in LanDeviceLinkProvider and LanDeviceLink
2015-01-06 21:48:25 -08:00
Àlex Fiestas
d971269bd5
Remove kdebugnamespace completely and replace by core_debug
...
In those places that belong to "core" we use core_debug, in any other
place we have added custom logging categories so we use those instead.
2014-09-22 00:59:34 +02:00
Àlex Fiestas
df0c262998
Port core to qCDebug
...
I had to keep the old kDebug code in kdebugnamespace because other parts
of the code are using it. Will be removed as soon as all code using it
is ported as well.
2014-09-21 23:54:27 +02:00
Albert Vaca
cabb0f2f7b
Simplified debug areas so we only have one, called "kdeconnect"
2014-07-01 01:26:08 +02:00
Aleix Pol
b88897847b
Reorganize sources
...
We broke kded into core and kded, core contains the library with the backends
and plugins.
Also we renamed libkdeconnect to interfaces.
2014-06-14 15:22:40 +02:00