mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-18 13:59:32 +00:00
Code Issues Releases Wiki Activity

Trying to simplify the sendPackage logic.

Browse Source
This commit is contained in:
Albert Vaca
2015-01-29 23:57:58 -08:00
parent 288ca01e44
commit f0935ebb8a
6 changed files with 171 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
View File

@@ -36,29 +36,30 @@ public class LoopbackLink extends BaseLink {
}
@Override
public boolean sendPackage(NetworkPackage in,Device.SendPackageStatusCallback callback) {
String s = in.serialize();
NetworkPackage out= NetworkPackage.unserialize(s);
if (in.hasPayload()) out.setPayload(in.getPayload(), in.getPayloadSize());
packageReceived(out);
return true;
public void sendPackage(NetworkPackage in, Device.SendPackageStatusCallback callback) {
sendPackageEncrypted(in, callback, null);
}
@Override
public boolean sendPackageEncrypted(NetworkPackage in,Device.SendPackageStatusCallback callback, PublicKey key) {
public void sendPackageEncrypted(NetworkPackage in, Device.SendPackageStatusCallback callback, PublicKey key) {
try {
in = in.encrypt(key);
if (key != null) {
in = in.encrypt(key);
}
String s = in.serialize();
NetworkPackage out= NetworkPackage.unserialize(s);
out.decrypt(privateKey);
if (key != null) {
out.decrypt(privateKey);
}
packageReceived(out);
if (in.hasPayload()) out.setPayload(in.getPayload(), in.getPayloadSize());
return true;
if (in.hasPayload()) {
callback.sendProgress(0);
out.setPayload(in.getPayload(), in.getPayloadSize());
callback.sendProgress(100);
}
callback.sendSuccess();
} catch(Exception e) {
e.printStackTrace();
Log.e("LoopbackLink", "Encryption exception");
return false;
callback.sendFailure(e);
}
}
}