mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-30 13:47:41 +00:00
Code Issues Releases Wiki Activity

Fixed capabilities being loaded for failed plugins

Browse Source
This commit is contained in:
Albert Vaca
2015-09-12 08:06:12 -07:00
parent 9c29cbf594
commit 33c233c780
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,8 +28,6 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Looper;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
@@ -38,9 +36,9 @@ import android.util.Log;
import org.kde.kdeconnect.Backends.BaseLink; import org.kde.kdeconnect.Backends.BaseLink;
import org.kde.kdeconnect.Helpers.ObjectsHelper; import org.kde.kdeconnect.Helpers.ObjectsHelper;
import org.kde.kdeconnect.UserInterface.MaterialActivity;
import org.kde.kdeconnect.Plugins.Plugin; import org.kde.kdeconnect.Plugins.Plugin;
import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect.Plugins.PluginFactory;
import org.kde.kdeconnect.UserInterface.MaterialActivity;
import org.kde.kdeconnect_tp.R; import org.kde.kdeconnect_tp.R;
import java.security.KeyFactory; import java.security.KeyFactory;
@@ -793,10 +791,6 @@ public class Device implements BaseLink.PackageReceiver {
pluginEnabled = isPluginEnabled(pluginKey); pluginEnabled = isPluginEnabled(pluginKey);
} }
if (pluginEnabled) {
newSupportedIncomingInterfaces.addAll(incomingInterfaces);
}
if (supportsCapabilities && (!incomingInterfaces.isEmpty() || !outgoingInterfaces.isEmpty())) { if (supportsCapabilities && (!incomingInterfaces.isEmpty() || !outgoingInterfaces.isEmpty())) {
HashSet<String> supportedOut = new HashSet<>(outgoingInterfaces); HashSet<String> supportedOut = new HashSet<>(outgoingInterfaces);
supportedOut.retainAll(incomingCapabilities); //Intersection supportedOut.retainAll(incomingCapabilities); //Intersection
@@ -813,18 +807,23 @@ public class Device implements BaseLink.PackageReceiver {
boolean success = addPlugin(pluginKey); boolean success = addPlugin(pluginKey);
if (success) { if (success) {
newSupportedIncomingInterfaces.addAll(incomingInterfaces);
for (String packageType : incomingInterfaces) { for (String packageType : incomingInterfaces) {
ArrayList<String> plugins = newPluginsByIncomingInterface.get(packageType); ArrayList<String> plugins = newPluginsByIncomingInterface.get(packageType);
if (plugins == null) plugins = new ArrayList<>(); if (plugins == null) plugins = new ArrayList<>();
plugins.add(pluginKey); plugins.add(pluginKey);
newPluginsByIncomingInterface.put(packageType, plugins); newPluginsByIncomingInterface.put(packageType, plugins);
} }
for (String packageType : outgoingInterfaces) { for (String packageType : outgoingInterfaces) {
ArrayList<String> plugins = newPluginsByOutgoingInterface.get(packageType); ArrayList<String> plugins = newPluginsByOutgoingInterface.get(packageType);
if (plugins == null) plugins = new ArrayList<>(); if (plugins == null) plugins = new ArrayList<>();
plugins.add(pluginKey); plugins.add(pluginKey);
newPluginsByOutgoingInterface.put(packageType, plugins); newPluginsByOutgoingInterface.put(packageType, plugins);
} }
} }
} else { } else {
removePlugin(pluginKey); removePlugin(pluginKey);