tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1451 commits 81 branches 117 tags 12 MiB
Commit graph

1451 commits

This branch
This branch
All branches
Author SHA1 Message Date
l10n daemon script
496d2ecaa4 SVN_SILENT made messages (after extraction) 2016-08-19 07:03:12 +00:00
Aleix Pol
0774020899 Merge branch '1.0' into 1.x 2016-08-14 21:15:13 +02:00
l10n daemon script
8a2c59d5d7 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-08-14 11:54:14 +00:00
l10n daemon script
83c20daf30 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-08-13 12:14:28 +00:00
l10n daemon script
3215661fec 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-08-11 12:17:31 +00:00
l10n daemon script
89b61e03f5 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-08-10 11:53:40 +00:00
Aleix Pol
426bf2a105 Merge branch '1.0' 2016-08-08 19:39:21 +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
l10n daemon script
2058cbc1af 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-08-08 11:56:08 +00:00
l10n daemon script
fa1233b051 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-08-06 12:40:34 +00:00
l10n daemon script
9788f8f96b 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-08-05 11:37:14 +00:00
l10n daemon script
ae766f5839 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-08-04 12:30:52 +00:00
l10n daemon script
1113d3d15a SVN_SILENT made messages (after extraction) 2016-08-04 11:05:14 +00: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
fa293e6d8a Reverted docs version as we didn't change them. 2016-07-22 13:13:30 +02:00
Albert Vaca
2113dbf98d Bumped version number to release 2016-07-22 12:46:45 +02:00
Albert Vaca
bd0920d354 Changed string 2016-07-13 18:25:44 +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
0b3de33d74 Minor 2016-07-12 12:33:57 +02:00
Albert Vaca
4e8a325479 Do not specify type for struct 2016-07-12 12:32:58 +02:00
Albert Vaca
6248f03256 Made a QString const refrence. 2016-07-07 01:09:07 +02:00
Albert Vaca
47c78427cb Removed outdated comment 2016-07-07 01:07:51 +02:00
Aleix Pol
81634303b2 Make capabilities static 
As discussed with Albert, move the population of capabilities into the
identity package, making them static along the execution of the link.

When we receive the identityPackage, we collect the plugins we can use with
the device and stick to those. This should simplify the implementation and
remove the possibility to lose packages if packages are received before the
capabilities are processed in the former approach.

REVIEW: 128386
 2016-07-06 17:37:22 +02:00
Aleix Pol
afdac88885 Proper i18n use 2016-07-06 16:41:38 +02:00
Aleix Pol
8d7d820ef4 Naming consistency. Capabilities is the correct name 2016-07-06 15:55:04 +02:00
Aleix Pol
0e76082fc6 Remove commented code 
Used to be used when we encrypted and decrypted using QCA. Now it's done
by the device link.
 2016-07-06 00:59:37 +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
Aleix Pol
0d6a7bafcf Remove unused variable 2016-07-05 13:14:55 +02:00
Aleix Pol
5a265a55de Start consuming right away, if there's data available from the start 
Fixes sendfiletest
 2016-07-05 13:14:47 +02:00
Albert Vaca
963a15bd08 Fixed crash where a device was destroyed but links tried to use it. 2016-07-05 12:42:57 +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
Albert Vaca
8c07d88c17 Int was too large. 2016-07-05 12:28:31 +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
308a89f5ea playerList was sometimes sent as null since this change (maybe when empty?) 
Reverted to the previous, saner, syntax.
 2016-06-26 17:11:08 +02:00
Albert Vaca
04713de718 Remove qdebugs 2016-06-26 15:48:37 +02:00
Albert Vaca
c154d9702b Only return if telepathy actually handles the message 2016-06-26 15:48:37 +02:00
Albert Vaca
e896449e74 Moved telepathy component to its own repo: telepathy-kdeconnect 2016-06-26 15:48:37 +02:00
l10n daemon script
60c3bf9b90 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-06-22 16:33:04 +00: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
Aleix Pol
86b086e392 Make warnings actual warnings 2016-06-22 16:31:01 +02:00
Albert Vaca
7af35b00f2 Send sms to a number, not a contact name. Use the contact name for display. 
CCMAIL: david@davidedmundson.co.uk
 2016-06-22 14:27:31 +02:00
Albert Vaca
9939b58df0 Merge telephonyplugin and telepathy plugin 
We now use the telepathy interface when it's available, and fall back to
our custom dialog when it's not. This also makes the kdeconnect telepathy
connection manager be completely decoupled from the kdeconnect code.

CCMAIL: david@davidedmundson.co.uk
 2016-06-22 14:27:09 +02:00
Albert Vaca
01139d31d1 De-duplicated socket SSL configuration code 2016-06-22 14:27:09 +02:00
Aleix Pol
f011191eca Fix few issues in FileTransferJob 
Handle errors from different endpoints
Don't ::startTransfer when we find a colliding file
 2016-06-22 12:42:51 +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