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
|
d35623a28a
|
Fixed discoverable mode dropping connections that we didn't create
|
2015-09-09 03:31:39 -07:00 |
|
Vineet Garg
|
ce5d2c8394
|
Reimplemented pairing handler interface, now it it is similar to kde version
|
2015-08-13 14:55:00 +05:30 |
|
Vineet Garg
|
8128c42824
|
Added support to send payload over ssl
|
2015-06-20 20:54:39 +05:30 |
|
Vineet Garg
|
00a4d39bf6
|
Added support to verify keys during pair
|
2015-06-20 17:48:58 +05:30 |
|
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 |
|
Albert Vaca
|
f01811446a
|
Migrated project to latest Android SDK and moved sources out of 'main' dir
Sorry for the conflicts caused by moving the sources!
|
2014-11-22 17:04:37 -08:00 |
|