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

Merge branch 'albertvaka/presenter-pointer'

Browse Source 
# Conflicts:
#	res/values/strings.xml
#	src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.java
This commit is contained in:
Albert Vaca Cintora
2019-07-19 23:02:39 +02:00
parent a1905bd031 2595d97fad
commit bdcefe4a2b
5 changed files with 125 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ import java.security.spec.PKCS8EncodedKeySpec;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -86,6 +87,11 @@ public class Device implements BaseLink.PacketReceiver {
private final SharedPreferences settings;
private final CopyOnWriteArrayList<PluginsChangedListener> pluginsChangedListeners = new CopyOnWriteArrayList<>();
private Set<String> incomingCapabilities = new HashSet<>();
public boolean supportsPacketType(String type) {
return incomingCapabilities.contains(type);
}
public interface PluginsChangedListener {
void onPluginsChanged(Device device);
@@ -489,12 +495,14 @@ public class Device implements BaseLink.PacketReceiver {
Set<String> outgoingCapabilities = identityPacket.getStringSet("outgoingCapabilities", null);
Set<String> incomingCapabilities = identityPacket.getStringSet("incomingCapabilities", null);
if (incomingCapabilities != null && outgoingCapabilities != null) {
supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(incomingCapabilities, outgoingCapabilities));
} else {
supportedPlugins = new Vector<>(PluginFactory.getAvailablePlugins());
}
this.incomingCapabilities = incomingCapabilities;
reloadPluginsFromSettings();