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

Allow any type of list to be passed into NetworkPackage

Browse Source 
And change return types to use List interface as well.

REVIEW: 128287
This commit is contained in:
Saikrishna Arcot
2016-06-28 21:52:58 +02:00
committed by Albert Vaca
parent 4e86eb0dd3
commit 7981d952ec
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -81,8 +82,8 @@ public class Device implements BaseLink.PackageReceiver {
private final CopyOnWriteArrayList<BaseLink> links = new CopyOnWriteArrayList<>();
private ArrayList<String> incomingCapabilities = new ArrayList<>();
private ArrayList<String> outgoingCapabilities = new ArrayList<>();
private List<String> incomingCapabilities = new ArrayList<>();
private List<String> outgoingCapabilities = new ArrayList<>();
private final ConcurrentHashMap<String, Plugin> plugins = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, Plugin> failedPlugins = new ConcurrentHashMap<>();
@@ -550,8 +551,8 @@ public class Device implements BaseLink.PackageReceiver {
}
}
} else if (NetworkPackage.PACKAGE_TYPE_CAPABILITIES.equals(np.getType())) {
ArrayList<String> newIncomingCapabilities = np.getStringList("IncomingCapabilities");
ArrayList<String> newOutgoingCapabilities = np.getStringList("OutgoingCapabilities");
List<String> newIncomingCapabilities = np.getStringList("IncomingCapabilities");
List<String> newOutgoingCapabilities = np.getStringList("OutgoingCapabilities");
if (!ObjectsHelper.equals(newIncomingCapabilities, incomingCapabilities) ||
!ObjectsHelper.equals(newOutgoingCapabilities, outgoingCapabilities)) {
incomingCapabilities = newIncomingCapabilities;