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
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
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
Albert Vaca
a15b06cdc7
Minor fixes (mostly cosmetic) as per Android Lint analysis
2015-08-10 00:26:58 -07:00
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
