mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-22 18:07:55 +00:00
Code Issues Releases Wiki Activity

Prevent reloading plugins twice in a row

Browse Source
This commit is contained in:
Albert Vaca Cintora 2023-06-19 17:47:44 +02:00
parent 5c0c190f5a
commit cc0b94bd3d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,9 +296,11 @@ public class Device implements BaseLink.PacketReceiver {
links.add(link); links.add(link);
link.addPacketReceiver(this); link.addPacketReceiver(this);
updateDeviceInfo(link.getDeviceInfo()); boolean hasChanges = updateDeviceInfo(link.getDeviceInfo());
reloadPluginsFromSettings(); if (hasChanges || links.size() == 1) {
reloadPluginsFromSettings();
}
} }
public void removeLink(BaseLink link) { public void removeLink(BaseLink link) {
@ -316,9 +318,11 @@ public class Device implements BaseLink.PacketReceiver {
} }
} }
public void updateDeviceInfo(@NonNull DeviceInfo newDeviceInfo) { public boolean updateDeviceInfo(@NonNull DeviceInfo newDeviceInfo) {
boolean hasChanges = false;
if (!deviceInfo.name.equals(newDeviceInfo.name) || deviceInfo.type != newDeviceInfo.type) { if (!deviceInfo.name.equals(newDeviceInfo.name) || deviceInfo.type != newDeviceInfo.type) {
hasChanges = true;
deviceInfo.name = newDeviceInfo.name; deviceInfo.name = newDeviceInfo.name;
deviceInfo.type = newDeviceInfo.type; deviceInfo.type = newDeviceInfo.type;
if (isPaired()) { if (isPaired()) {
@ -329,12 +333,13 @@ public class Device implements BaseLink.PacketReceiver {
if (deviceInfo.outgoingCapabilities != newDeviceInfo.outgoingCapabilities || if (deviceInfo.outgoingCapabilities != newDeviceInfo.outgoingCapabilities ||
deviceInfo.incomingCapabilities != newDeviceInfo.incomingCapabilities) { deviceInfo.incomingCapabilities != newDeviceInfo.incomingCapabilities) {
if (newDeviceInfo.outgoingCapabilities != null && newDeviceInfo.incomingCapabilities != null) { if (newDeviceInfo.outgoingCapabilities != null && newDeviceInfo.incomingCapabilities != null) {
Log.e("updateDeviceInfo", "Updating supported plugins according to new capabilities"); hasChanges = true;
Log.i("updateDeviceInfo", "Updating supported plugins according to new capabilities");
supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(newDeviceInfo.incomingCapabilities, newDeviceInfo.outgoingCapabilities)); supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(newDeviceInfo.incomingCapabilities, newDeviceInfo.outgoingCapabilities));
reloadPluginsFromSettings();
} }
} }
return hasChanges;
} }
@Override @Override
@ -617,6 +622,7 @@ public class Device implements BaseLink.PacketReceiver {
} }
public void reloadPluginsFromSettings() { public void reloadPluginsFromSettings() {
Log.i("Device", deviceInfo.name +": reloading plugins");
MultiValuedMap<String, String> newPluginsByIncomingInterface = new ArrayListValuedHashMap<>(); MultiValuedMap<String, String> newPluginsByIncomingInterface = new ArrayListValuedHashMap<>();
for (String pluginKey : supportedPlugins) { for (String pluginKey : supportedPlugins) {