mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-05 08:35:10 +00:00
Code Issues Releases Wiki Activity

Renamed capabilities so we don't clash with KDE4's broken implementation

Browse Source
This commit is contained in:
Albert Vaca
2015-09-11 05:20:19 -07:00
parent 4456210953
commit 2c829af4e5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/kde/kdeconnect/Device.java
View File

@@ -434,8 +434,8 @@ public class Device implements BaseLink.PackageReceiver {
link.addPackageReceiver(this);
if (links.size() == 1) {
incomingCapabilities = identityPackage.getStringList("SupportedIncomingInterfaces");
outgoingCapabilities = identityPackage.getStringList("SupportedOutgoingInterfaces");
incomingCapabilities = identityPackage.getStringList("IncomingCapabilties");
outgoingCapabilities = identityPackage.getStringList("OutgoingCapabilities");
reloadPluginsFromSettings();
}
}
@@ -562,8 +562,8 @@ public class Device implements BaseLink.PackageReceiver {
}
} else if (NetworkPackage.PACKAGE_TYPE_CAPABILITIES.equals(np.getType())) {
ArrayList<String> newIncomingCapabilities = np.getStringList("SupportedIncomingInterfaces");
ArrayList<String> newOutgoingCapabilities = np.getStringList("SupportedOutgoingInterfaces");
ArrayList<String> newIncomingCapabilities = np.getStringList("IncomingCapabilities");
ArrayList<String> newOutgoingCapabilities = np.getStringList("OutgoingCapabilities");
if (!ObjectsHelper.equals(newIncomingCapabilities, incomingCapabilities) ||
!ObjectsHelper.equals(newOutgoingCapabilities, outgoingCapabilities)) {
incomingCapabilities = newIncomingCapabilities;
@@ -851,8 +851,8 @@ public class Device implements BaseLink.PackageReceiver {
if (capabilitiesChanged && isReachable() && isPaired()) {
NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_CAPABILITIES);
np.set("SupportedIncomingInterfaces", new ArrayList<>(newSupportedIncomingInterfaces));
np.set("SupportedOutgoingInterfaces", new ArrayList<>(newPluginsByOutgoingInterface.keySet()));
np.set("IncomingCapabilities", new ArrayList<>(newSupportedIncomingInterfaces));
np.set("OutgoingCapabilities", new ArrayList<>(newPluginsByOutgoingInterface.keySet()));
sendPackage(np);
}