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
1848e96a91
Fixed old signal name
2015-12-17 05:54:37 -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
945da8a84f
Removed encrypted package type define
2015-12-10 19:06:55 -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
77facdbcfd
Merge branch 'master' into sslrefactor
2015-12-07 03:38:06 -08:00
Albert Vaca
2e4ce90656
Commented out old encryption functions
2015-12-07 03:34:41 -08:00
Aleix Pol
42110549f4
Improve SharePlugin share notification method
...
Make the share received notification explicitly internal.
Fix runtime warning about how QUrl cannot be exported.
Notify about all shares, not exclusively transferred files.
2015-12-07 03:27:40 +01:00
Aleix Pol
70f55d0ebc
Fix compilation and a couple of warnings
...
CCMAIL: holger.k@elberer.de
2015-12-07 03:21:35 +01: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
Aleix Pol
97d97ffa1b
Fix connect
2015-12-06 01:18:27 +01:00
Aleix Pol
a45e48ca7a
Fix tests build
...
Daemon::requestPairing changed into ::askPairingConfirmation.
2015-12-06 00:08:02 +01:00
Holger Kaelberer
4fc39601dd
tests: add test-case for NotificationsListener
2015-12-05 23:23:22 +01:00
Holger Kaelberer
f072a0c615
notifications: allow to configure how to sync desktop notifications
...
Added kcm ui with global and app-specific config options.
Global options affect all notifications:
- Persistent only? --> Sync only notifications with timeout == 0?
- Include body? --> Add body string to summary when syncing?
- Minimum urgency
Per-application options affect notifications sent by a specific
application:
- Sync it at all?
- If yes, allow to define a "blacklist" pattern (QRegularExpression)
to define which notifications should *not* be synced.
Applications are maintained in the per-device config and added when
seen the first time by the notification listener. From that moment on
they can be configured in the kcm ui.
2015-12-05 23:23:22 +01:00
Holger Kaelberer
2a74eb68f8
notifications: add initial support for desktop-to-xxx notifications
...
Eavesdrop on the Notify call of the org.freedesktop.Notifications
dbus-interface, proxy all caught notifications to our peer device and
track them in the internal notifications-list.
Also fix "cancel" requests from peer devices, by cutting of
kdeconnect-android's id-prefix.
2015-12-05 23:23:22 +01:00
l10n daemon script
2ca1d9720e
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"
2015-12-03 09:40:02 +00:00
l10n daemon script
d57c80f34e
SVN_SILENT made messages (after extraction)
2015-12-03 07:32:23 +00: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
Albert Vaca
82bc73dd9b
WIPx2
2015-12-01 07:25:34 -08:00
Albert Vaca
16f9af908a
WIP
2015-11-30 10:36:01 -08:00
Albert Vaca
30d2dd991b
Merge branch 'master' into sslmaster
2015-11-30 03:40:07 -08:00
l10n daemon script
949408119d
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"
2015-11-30 10:26:50 +00:00
l10n daemon script
ddf57be9fa
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"
2015-11-26 15:54:02 +00:00
Aleix Pol
2eadc8d97e
Fix warnings
2015-11-26 16:19:00 +01:00
Elvis Angelaccio
c3b4b7190a
Fix typo in fileitemaction plugin's name
...
REVIEW: 126169
2015-11-25 17:38:58 +01:00
Aleix Pol
0809e33118
Fix compilation with newer (and older, i.e. last relased) telepathy-qt versions
2015-11-23 12:39:25 +01:00
l10n daemon script
7558fdd93c
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"
2015-11-22 09:53:09 +00:00
Michael Palimaka
af26fe245a
Remove unused dependency.
...
REVIEW: 126116
2015-11-20 02:49:08 +11:00
l10n daemon script
ce766fb7ff
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"
2015-11-19 12:12:59 +00:00
l10n daemon script
fc2bd97e69
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"
2015-11-17 12:54:36 +00:00
l10n daemon script
5f66f7a7a6
SVN_SILENT made messages (after extraction)
2015-11-17 09:53:56 +00:00
l10n daemon script
f92534583d
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"
2015-11-13 10:40:06 +00:00
Aleix Pol
b1692142b1
Polish NotificationsModel::isAnyDismissable proprety
...
Let qml know it's computed on every call.
Consider it might have changed whenever a new notification enters as well.
2015-11-12 12:27:30 +01:00