2
0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 12:47:43 +00:00

82 Commits

Author SHA1 Message Date
Albert Vaca
05e031d41f Changed to match the kdeconnect-kde side 2016-06-02 15:23:49 +02:00
Albert Vaca
d7956650da Log when sending a package type that no plugin has declared 2016-06-02 15:23:34 +02:00
Albert Vaca
43467aedd8 Hack to make packet types match those of older versions 2016-06-02 15:22:40 +02:00
Albert Vaca
541cd97c71 If capabilities are not present, iterate all plugins 2016-06-02 15:22:21 +02:00
Albert Vaca
7759152eeb Do not swallow packets silently 2016-06-02 13:56:46 +02:00
Albert Vaca
0897f25a6f Less verbose logging of unmatched capabilities 2016-06-02 12:28:33 +02:00
Albert Vaca
614505518b Fixed capabilities 2016-05-31 21:02:17 +02:00
Albert Vaca
240fa34833 Do not use encryption if the protocol is 6 2016-05-31 21:00:18 +02:00
Albert Vaca
d539cd704b Since we renamed the capabilities, disable them on old clients
We don't want old kdeconnects to try to use the renamed capabilities.
2016-05-31 17:23:55 +02:00
Albert Vaca
0eba461654 Moved all the bouncy(spongy)castle code to the SslHelper class 2016-03-03 15:42:39 -08:00
Albert Vaca
7813b7309d Fixme 2016-03-03 15:41:44 -08:00
Albert Vaca
4d553518f6 BouncyCastle doesn't work on Android 2.3, but spongy does
Now we have to make sshd work with spongy
2016-03-03 11:11:39 -08:00
Albert Vaca
c0d21e986c Re-use existing link instead of creating a new one 2016-03-02 11:39:49 -08:00
Albert Vaca
98ef6aec8c Handle the case where there is no publicKey stored (for protocol v6) 2016-02-12 08:37:47 -08:00
Albert Vaca
d07ff5a802 SSHD gets confused if spongycastle is present. Changed to BouncyCastle.
It sees it as bouncycastle, tries to load some clases by they classpath and
fails.
2016-01-10 08:46:52 -08:00
Albert Vaca
1ca09d7f58 Fixing build 2016-01-10 03:16:14 -08:00
Albert Vaca
3e9509123e Merge branch 'master' into sslmaster 2016-01-10 01:24:26 -08:00
Holger Kaelberer
8e990765da Fix loosing already known plugins on reloading
REVIEW: 126273
2016-01-05 20:35:52 +01:00
Albert Vaca
f8da00b9b5 Merge branch 'master' into sslmaster 2015-12-02 09:46:22 -08:00
Albert Vaca
9322970d58 Merge branch '0.9'
# Conflicts:
#	res/values-ca/strings.xml
#	res/values-fi/strings.xml
#	res/values-nl/strings.xml
#	res/values-pt-rBR/strings.xml
#	res/values-pt/strings.xml
#	res/values-sv/strings.xml
#	res/values-uk/strings.xml
#	res/values/strings.xml
#	src/org/kde/kdeconnect/Device.java
2015-09-18 08:11:44 -07:00
Albert Vaca
47c9729e04 Removed logs 2015-09-18 04:40:33 -07:00
Albert Vaca
45ca9aae89 Fixed concurrent modification exception 2015-09-14 04:19:13 -07:00
Albert Vaca
80026f6d62 Merge branch 'stable' 2015-09-12 13:30:21 -07:00
Albert Vaca
24ca5f706a Fixed pairing requests not being displayed after clicking the notification 2015-09-12 13:21:06 -07:00
Albert Vaca
0732f94a78 Fixed outgoing interfaces 2015-09-12 08:51:00 -07:00
Albert Vaca
33c233c780 Fixed capabilities being loaded for failed plugins 2015-09-12 08:06:12 -07:00
Albert Vaca
9c29cbf594 Load plugins in the same thread, so we know if they failed or not
This way we can update the capabilities accordingly.
2015-09-12 07:29:45 -07:00
Aleix Pol
effa740db4 Don't block plugins if they don't have any capabilities
Reviewed by Albert Vaca
2015-09-12 12:25:22 +02:00
Aleix Pol
3de229f1e5 Fix crash during exception catch
Reviewed by Albert Vaca
2015-09-12 12:24:38 +02:00
Aleix Pol
9b03bdf2c0 Make it possible to trigger a plugin page reload
Reviewed by Albert Vaca
2015-09-12 12:24:11 +02:00
Albert Vaca
f5725b7c8d Merge branch 'master' into ssl
# Conflicts:
#	build.gradle
#	src/org/kde/kdeconnect/Backends/BaseLink.java
#	src/org/kde/kdeconnect/Backends/BaseLinkProvider.java
#	src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
#	src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
#	src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
#	src/org/kde/kdeconnect/BackgroundService.java
#	src/org/kde/kdeconnect/Device.java
#	src/org/kde/kdeconnect/Helpers/DeviceHelper.java
#	src/org/kde/kdeconnect/UserInterface/DeviceActivity.java
#	src/org/kde/kdeconnect/UserInterface/PairActivity.java
#	tests/org/kde/kdeconnect/LanLinkProviderTest.java
#	tests/org/kde/kdeconnect/LanLinkTest.java
2015-09-11 09:24:35 -07:00
Albert Vaca
2c829af4e5 Renamed capabilities so we don't clash with KDE4's broken implementation 2015-09-11 05:20:19 -07:00
Albert Vaca
4456210953 Merge branch 'stable' 2015-09-11 04:45:06 -07:00
Albert Vaca
9fed9e4b9a Added a new custom icon for notifications 2015-09-11 03:46:23 -07:00
Albert Vaca
7fc7a37be4 Merge branch 'stable' 2015-09-10 08:12:22 -07:00
Albert Vaca
dcb54ebf4a Fixed some potential concurrent modification exceptions 2015-09-10 08:05:23 -07:00
Albert Vaca
132a223b8c Merge branch 'stable'
# Conflicts:
#	src/org/kde/kdeconnect/Device.java
2015-09-10 07:52:37 -07:00
Albert Vaca
35dd42f560 Fixed some potential concurrent modification exceptions
# Conflicts:
#	src/org/kde/kdeconnect/Device.java
2015-09-10 07:49:28 -07:00
Albert Vaca
d7123e3435 Merge branch 'stable' 2015-09-09 14:58:01 -07:00
Albert Vaca
a9b4a6bdea Removed printfs and coding style stuff 2015-09-09 12:30:13 -07:00
Albert Vaca
0b8500338a Removed some logging 2015-09-09 03:22:34 -07:00
Albert Vaca
1fe01db26e Assume computer by default from the phone for device with no type 2015-09-09 01:51:32 -07:00
Albert Vaca
f56fc9ceb8 Device type should be "desktop", no "computer" 2015-09-09 01:51:03 -07:00
Albert Vaca
13ec8d7a3f Fixed crash on older Androids 2015-09-09 01:51:03 -07:00
Albert Vaca
cedffe6578 Assume computer by default from the phone for device with no type 2015-09-09 01:50:12 -07:00
Albert Vaca
edb0ae3198 Device type should be "desktop", no "computer" 2015-09-09 01:50:11 -07:00
Aleix Pol
4fa0a89691 Merge branch 'stable' 2015-09-09 00:46:53 +02:00
Aleix Pol
628142307f Reduce the amount of traffic we get
Only connect to the non-paired devices when we're on discovery mode,
otherwise disconnect from them.

Reviewed by Albert Vaca

BUG: 352424
2015-09-09 00:45:56 +02:00
Albert Vaca
476f7a7840 Implemented capabilities 2015-09-08 15:05:32 -07:00
Albert Vaca
92e4fa864a Removed old UI 2015-09-07 02:16:23 -07:00