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
Albert Vaca
8d9634730f
DeviceFragment now also has the UI for pairing, dropped PairingActivity.
2015-09-07 02:16:23 -07:00
Ashish Bansal
0eb3c6e9f5
Load plugins which are registered to listen to unpaired devices
...
Plugins which are registered to receive packages from unpaired devices
should be loaded even if device is not paired, otherwise they won't be
able to listen to NetworkPackages from the unpaired devices.
REVIEW: 124906
2015-08-27 13:06:24 +05:30
Vineet Garg
f908f5d8a1
Added spongy castle back, to support certificate generation on older devices which is not possible using bouncy castle due to same class name conflict
...
Fixed TLS version to TLSv1, this saves a connection failure due to TLSv1.2 hello message from devices with latest android versions
If device with new android version enquires about certificate from device with old version (<14) using setNeedClientAuth, connection fails on older device due to variation in certificate request code. So disabled server loop on older devices and using reverse connection hack for successful connection. But due to this, they can't connect to devices with similar android vesion since server is disabled on both and for a successful connection one should be server and one should be client
2015-08-24 02:03:55 +05:30
Vineet Garg
c4a27255a7
Removed spongycastle, now using bouncy castle version
...
Added reverse connection blacklist again
2015-08-23 00:11:36 +05:30
Albert Vaca
b34e7c8a78
Missing breaks in switch
2015-08-20 00:50:56 -07:00
Ashish Bansal
0868394596
Changed abstract plugin to receive packages from unpaired device
...
Now plugin can register to receive network packages from unpaired
devices.
REVIEW: 124819
2015-08-19 21:36:56 +05:30
Vineet Garg
7c9d6630d0
Show encryption info in device activity too
2015-08-15 18:44:49 +05:30
Vineet Garg
ce5d2c8394
Reimplemented pairing handler interface, now it it is similar to kde version
2015-08-13 14:55:00 +05:30
Albert Vaca
a15b06cdc7
Minor fixes (mostly cosmetic) as per Android Lint analysis
2015-08-10 00:26:58 -07:00
Vineet Garg
442c01a8e5
Added x86 and mips conscrypt libs
...
Pairing is now done through links
2015-07-01 03:25:16 +05:30
Vineet Garg
d93eb5d71e
Added conscrypt, open ssl based provider for android
...
Fixed some isssues in CR
2015-06-28 20:07:05 +05:30
Vineet Garg
1b726018d3
Fixed bugs pointed out by Albert on CR
2015-06-25 04:20:03 +05:30
Vineet Garg
00557052ff
Corrected unit tests
...
Settings were not save properly when certificate was null
Removed LanLinkProvider test, impossible with new design
2015-06-21 17:30:29 +05:30
Vineet Garg
e14f5a0df1
Ssl support added
...
Showing high cpu usage on some devices
2015-06-20 04:09:02 +05:30
Albert Vaca
99a6578ce3
If both devices request pairing at the same time, we just pair.
...
The second device accepts the request instead of failing.
2015-06-15 09:03:38 -07:00
Albert Vaca
5b694a3b3e
Fixed Android 4.1 crash
2015-06-14 02:59:14 -07:00
Vineet Garg
3aadc94278
Added tests - DeviceTest and NetworkPackageTest
2015-06-10 12:29:53 +05:30
Albert Vaca
3b0a3e265d
Plugin key is now the plugin class instead of being defined by each plugin
2015-06-06 00:39:04 -07:00
Albert Vaca
7c3e223e29
Default to phone instead of tablet for unknown devices
2015-06-06 00:32:05 -07:00
Albert Vaca
299e7e8375
Handling device type. Added device type icons (still unused).
2015-05-08 23:24:01 -07:00
Albert Vaca
bf02f639b7
Unpair if something goes wrong while loading a remembered device
2015-05-08 23:20:23 -07:00
Albert Vaca
c3ad265490
Fixed crash
2015-04-04 14:41:22 -07:00
Albert Vaca
a0b82d17b4
Added some logging to help debugging an issue, now commented for future use
...
Also we prepend KDE/ to these logs to ease filtering them
2015-04-04 11:37:12 -07:00
Albert Vaca
46c70639ac
Only unpair when receiving unknown packages if I'm not requesting pairing
...
In case the other device thinks we are paired and answers my identity
packet with unexpected stuff.
2015-03-30 23:26:57 -07:00
Vineet Garg
ea514c0a19
Previous commit was blocking links.add(link) for unpaired devices
...
Public key was set to null for unpaired devices and its Base64 encoding
was causing an exception.
REVIEW: 122806
2015-03-04 18:32:55 -08:00
Albert Vaca
db3f4a2fec
We now update the name of a device if it changed the next time we see it
2015-03-01 20:57:45 -08:00
Albert Vaca
3d415c5959
Fixes to the new sendPackage logic
2015-02-01 12:31:42 -08:00
Albert Vaca
86261bd105
Lint fixes
2015-02-01 12:31:42 -08:00
Albert Vaca
f0935ebb8a
Trying to simplify the sendPackage logic.
2015-02-01 12:31:41 -08:00
Vineet Garg
1edca5e45c
Added progress bar in notification while sending file
...
REVIEW: 121980
2015-01-17 16:40:57 -08:00
