diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 324d12e7..4c2a8391 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,274 +1,274 @@ + android:versionCode="11230" + android:versionName="1.12.3-nosms"> \ No newline at end of file diff --git a/src/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/org/kde/kdeconnect/Plugins/PluginFactory.java index 9e538ecb..95f2d0c9 100644 --- a/src/org/kde/kdeconnect/Plugins/PluginFactory.java +++ b/src/org/kde/kdeconnect/Plugins/PluginFactory.java @@ -1,225 +1,222 @@ /* * Copyright 2014 Albert Vaca Cintora * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ package org.kde.kdeconnect.Plugins; import android.content.Context; import android.graphics.drawable.Drawable; import android.util.Log; -import org.atteo.classindex.ClassIndex; import org.atteo.classindex.IndexAnnotated; import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Plugins.BatteryPlugin.BatteryPlugin; import org.kde.kdeconnect.Plugins.ClibpoardPlugin.ClipboardPlugin; import org.kde.kdeconnect.Plugins.ContactsPlugin.ContactsPlugin; import org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhonePlugin; import org.kde.kdeconnect.Plugins.FindRemoteDevicePlugin.FindRemoteDevicePlugin; import org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadPlugin; import org.kde.kdeconnect.Plugins.MprisPlugin.MprisPlugin; -import org.kde.kdeconnect.Plugins.MprisReceiverPlugin.MprisReceiverPlugin; import org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationsPlugin; import org.kde.kdeconnect.Plugins.PhotoPlugin.PhotoPlugin; import org.kde.kdeconnect.Plugins.PingPlugin.PingPlugin; import org.kde.kdeconnect.Plugins.PresenterPlugin.PresenterPlugin; import org.kde.kdeconnect.Plugins.ReceiveNotificationsPlugin.ReceiveNotificationsPlugin; import org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardPlugin; import org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandPlugin; -import org.kde.kdeconnect.Plugins.SMSPlugin.SMSPlugin; import org.kde.kdeconnect.Plugins.SftpPlugin.SftpPlugin; import org.kde.kdeconnect.Plugins.SharePlugin.SharePlugin; import org.kde.kdeconnect.Plugins.SystemvolumePlugin.SystemvolumePlugin; import org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin; import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; public class PluginFactory { @IndexAnnotated public @interface LoadablePlugin { } //Annotate plugins with this so PluginFactory finds them public static class PluginInfo { PluginInfo(String displayName, String description, Drawable icon, boolean enabledByDefault, boolean hasSettings, boolean listenToUnpaired, String[] supportedPacketTypes, String[] outgoingPacketTypes, Class instantiableClass) { this.displayName = displayName; this.description = description; this.icon = icon; this.enabledByDefault = enabledByDefault; this.hasSettings = hasSettings; this.listenToUnpaired = listenToUnpaired; HashSet incoming = new HashSet<>(); if (supportedPacketTypes != null) Collections.addAll(incoming, supportedPacketTypes); this.supportedPacketTypes = Collections.unmodifiableSet(incoming); HashSet outgoing = new HashSet<>(); if (outgoingPacketTypes != null) Collections.addAll(outgoing, outgoingPacketTypes); this.outgoingPacketTypes = Collections.unmodifiableSet(outgoing); this.instantiableClass = instantiableClass; } public String getDisplayName() { return displayName; } public String getDescription() { return description; } public Drawable getIcon() { return icon; } public boolean hasSettings() { return hasSettings; } public boolean isEnabledByDefault() { return enabledByDefault; } public boolean listenToUnpaired() { return listenToUnpaired; } Set getOutgoingPacketTypes() { return outgoingPacketTypes; } public Set getSupportedPacketTypes() { return supportedPacketTypes; } Class getInstantiableClass() { return instantiableClass; } private final String displayName; private final String description; private final Drawable icon; private final boolean enabledByDefault; private final boolean hasSettings; private final boolean listenToUnpaired; private final Set supportedPacketTypes; private final Set outgoingPacketTypes; private final Class instantiableClass; } private static final Map pluginInfo = new ConcurrentHashMap<>(); static Class pluginClasses[] = { BatteryPlugin.class, ClipboardPlugin.class, ContactsPlugin.class, FindMyPhonePlugin.class, FindRemoteDevicePlugin.class, MousePadPlugin.class, MprisPlugin.class, - MprisReceiverPlugin.class, + //MprisReceiverPlugin.class, //Breaks in Android 4 NotificationsPlugin.class, PhotoPlugin.class, PingPlugin.class, PresenterPlugin.class, ReceiveNotificationsPlugin.class, RemoteKeyboardPlugin.class, RunCommandPlugin.class, SftpPlugin.class, SharePlugin.class, //SMSPlugin.class, SystemvolumePlugin.class, TelephonyPlugin.class, }; public static PluginInfo getPluginInfo(String pluginKey) { return pluginInfo.get(pluginKey); } public static void initPluginInfo(Context context) { try { for (Class pluginClass : pluginClasses) { Plugin p = ((Plugin) pluginClass.newInstance()); p.setContext(context, null); PluginInfo info = new PluginInfo(p.getDisplayName(), p.getDescription(), p.getIcon(), p.isEnabledByDefault(), p.hasSettings(), p.listensToUnpairedDevices(), p.getSupportedPacketTypes(), p.getOutgoingPacketTypes(), p.getClass()); pluginInfo.put(p.getPluginKey(), info); } } catch (Exception e) { throw new RuntimeException(e); } Log.i("PluginFactory","Loaded "+pluginInfo.size()+" plugins"); } public static Set getAvailablePlugins() { return pluginInfo.keySet(); } public static Plugin instantiatePluginForDevice(Context context, String pluginKey, Device device) { PluginInfo info = pluginInfo.get(pluginKey); try { Plugin plugin = info.getInstantiableClass().newInstance(); plugin.setContext(context, device); return plugin; } catch (Exception e) { Log.e("PluginFactory", "Could not instantiate plugin: " + pluginKey); e.printStackTrace(); return null; } } public static Set getIncomingCapabilities() { HashSet capabilities = new HashSet<>(); for (PluginInfo plugin : pluginInfo.values()) { capabilities.addAll(plugin.getSupportedPacketTypes()); } return capabilities; } public static Set getOutgoingCapabilities() { HashSet capabilities = new HashSet<>(); for (PluginInfo plugin : pluginInfo.values()) { capabilities.addAll(plugin.getOutgoingPacketTypes()); } return capabilities; } public static Set pluginsForCapabilities(Set incoming, Set outgoing) { HashSet plugins = new HashSet<>(); for (Map.Entry entry : pluginInfo.entrySet()) { String pluginId = entry.getKey(); PluginInfo info = entry.getValue(); //Check incoming against outgoing if (Collections.disjoint(outgoing, info.getSupportedPacketTypes()) && Collections.disjoint(incoming, info.getOutgoingPacketTypes())) { Log.i("PluginFactory", "Won't load " + pluginId + " because of unmatched capabilities"); continue; //No capabilities in common, do not load this plugin } plugins.add(pluginId); } return plugins; } }