Aleix Pol
668c37446c
Fix typo that prevented the dolphin integration to work
...
BUG: 362684
2016-05-06 02:07:31 +02:00
Aleix Pol
c2349bacd7
Make sure we don't eat all system memory
...
I had wrong configuration files, the encription algorithm definitely
doesn't take it into account.
2016-05-05 17:45:49 +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
David Kahles
623ca94a0c
Don't hardcode app name to filter notifications
...
The app name used by KNotification is translated, and thus the filtering
doesn't work if the translated app name is different.
REVIEW: 127768
2016-04-28 00:19:19 +02:00
Albert Vaca
0c95010c3b
Merge branch 'master' into sslrefactor
...
# Conflicts:
# core/device.cpp
# interfaces/devicesmodel.cpp
2016-04-14 19:00:42 -07:00
Albert Vaca
29d3f9aa7a
Expose protocol version
2016-04-14 18:52:31 -07:00
David Kahles
174cf3d3ce
Don't reset m_pairStatus when unpair is requested by remote device
...
unpairInternal() will take care of this, otherwise pairingChanged() will not
be emited and though, the model won't notice it.
REVIEW: 127641
2016-04-13 08:44:47 +02:00
l10n daemon script
ef488d10a8
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"
2016-04-11 10:21:02 +00:00
l10n daemon script
05cc6fa131
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"
2016-04-09 09:56:16 +00:00
David Kahles
3103bd0c5a
Improve filtering of devices in the DevicesModel
...
We need to remove devices from the model if the filter doesn't match, to
prevent listing disconnected devices in the plasmoid.
REVIEW: 127610
2016-04-08 17:01:33 +02:00
David Kahles
337dd191e4
Fix mpris player discovery
...
The previous used QDbusServiceWatcher doesn't work as it does only watch out
for specific services, but the players use different, unpredictable names, so
we need to check all service registrations for mpris players.
BUG: 361367
REVIEW: 127611
2016-04-08 01:22:22 +02:00
David Kahles
8d7dad3604
Introduce QML component to check for plugin availability
...
Remove those checks from three different places and put them into a reusable
component, which can be used for different plugins.
REVIEW: 127583
2016-04-07 16:39:26 +02:00
David Kahles
aefa51fa86
Remove notifications from plasmoid, if the notifications plugin gets disabled
...
Therefore notify the client that we're deleting all notifications.
Otherwise the client wouldn't notice this and the notifications would still
be available in the plasmoid.
REVIEW: 127582
2016-04-06 02:30:50 +02:00
David Kahles
12ccbaef98
Improve NotificationsModel
...
Don't refresh the whole notification list, if a notification is added or
removed.
REVIEW: 127565
2016-04-05 23:33:45 +02:00
David Kahles
6cc1946443
Allow paired and not reachable devices in the model
...
The server supports this device state (e.g. if a device was saved as paired,
but isn't reachable), so let's expose it to the model.
The display filter should take care of excluding such devices if
nessecarry.
To make sure that such devices aren't shown in the kcm (we can't do anything
useful with them at the moment), set the display filter accordingly.
REVIEW: 127553
2016-04-05 23:33:45 +02:00
David Kahles
e86ea7b3bd
Remove the keys from the notification hashmap
...
When disabling the notifications plugin, we can't delete the notification
adapter due to a QT bug. Thus we leak it, and to not expose the notifications
anymore, we clean up the notifications in the adaptor. Therefore we delete
the QStrings in the notification hashmap (mNotifications) with qDeleteAll().
But this function does only free the QStrings, but no remove the keys from the
hashmap. Thus, a subsequent call to activeNotifications() has an undefined
behavior, as there are dangling pointers in the hashmap. This is solved by
removing the keys from the hashmap.
REVIEW: 127543
2016-04-05 23:33:45 +02:00
David Kahles
a8bd062baf
Stop clearing the notification list twice
...
There were two clearNotifications() calls when refreshing the notification
list. As there happens nothing relevant in between them, the second call is
useless.
REVIEW: 127542
2016-04-05 23:33:45 +02:00
Heiko Becker
ebce509158
Silence CMake policy CMP0063 warning
...
...by adding the NO_POLICY_SCOPE flag as recommended by ECM's
documentation.
2016-04-04 09:46:15 +02:00
Elias Probst
6b8595d418
Fix typo in debug msg (Batttery → Battery)
2016-03-24 23:47:55 +01: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
Àlex Fiestas
5d80bf9f23
If the package contains a photo, show it in the notification
...
If the received packet has a photo, set it as pixmap in the
notification, otherwise keep showing the icon.
REVIEW:127298
2016-03-07 11:34:41 +01:00
l10n daemon script
6e17178c0f
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"
2016-03-04 09:11:29 +00:00
l10n daemon script
c2ff5c5101
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"
2016-03-03 09:54:08 +00: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
b1ef3f9fc9
Use a different key for settings, so we don't clash with older versions.
2016-03-02 15:36:45 -08:00
l10n daemon script
2c88a0ab39
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"
2016-02-27 09:28:44 +00:00
l10n daemon script
1dbadf133a
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"
2016-02-24 09:10:43 +00:00
l10n daemon script
5df0923b22
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"
2016-02-22 10:51:54 +00:00
Albert Vaca
2f33fa0fc7
Hack to fix crash
2016-02-17 05:06:37 -08:00
Albert Vaca
a0deb776c1
Use passwords for sftp since Android doesn't have our pubkey anymore.
2016-02-17 04:51:28 -08:00
l10n daemon script
f6724de704
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"
2016-02-14 09:18:22 +00:00
l10n daemon script
7f668b59a3
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"
2016-02-13 09:43:43 +00: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
03bf6a3a96
Display the device name, not the link name
2016-02-12 08:00:05 -08:00
Albert Vaca
6cde0271fb
Removed loopbackpairinghandler
2016-02-12 07:59:12 -08:00
l10n daemon script
a9670e5a81
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"
2016-02-12 09:32:36 +00:00
l10n daemon script
024c1d0860
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"
2016-02-09 10:33:53 +00:00
l10n daemon script
8c515e7110
SVN_SILENT made messages (after extraction)
2016-02-09 08:28:33 +00:00
l10n daemon script
770c356371
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"
2016-02-08 13:39:47 +00:00
l10n daemon script
4b57abd556
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"
2016-02-06 09:47:03 +00:00
l10n daemon script
5eb9a54bcc
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"
2016-02-05 09:16:28 +00:00
Albert Vaca
95622ded12
Typo
...
BUG: 358972
2016-02-04 03:55:53 -08:00
l10n daemon script
9df0fc1e24
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"
2016-01-31 09:40:47 +00:00
Aleix Pol
b79dd9b919
Let KDE*CompilerSettings change the policies in the project
...
As suggested in ECM documentation.
2016-01-28 15:01:29 +01:00
l10n daemon script
51e989f454
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"
2016-01-23 10:32:56 +00:00
l10n daemon script
2b9217fab3
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"
2016-01-17 10:49:15 +00:00