Skip to content

Commit

Permalink
Merge pull request #8 from woodemi/develop
Browse files Browse the repository at this point in the history
Remove QuickUsbPluign native implementation on desktop
  • Loading branch information
Sunbreak committed Apr 29, 2022
2 parents ffc4b96 + 770a659 commit 8e5ac31
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 144 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import FlutterMacOS
import Foundation

import quick_usb

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
QuickUsbPlugin.register(with: registry.registrar(forPlugin: "QuickUsbPlugin"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<true/>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.device.usb</key>
<true/>
<key>com.apple.security.network.server</key>
<true/>
</dict>
Expand Down
2 changes: 2 additions & 0 deletions packages/quick_usb/example/macos/Runner/Release.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.device.usb</key>
<true/>
</dict>
</plist>
7 changes: 0 additions & 7 deletions packages/quick_usb/linux/include/quick_usb/quick_usb_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ G_BEGIN_DECLS
#define FLUTTER_PLUGIN_EXPORT
#endif

typedef struct _QuickUsbPlugin QuickUsbPlugin;
typedef struct {
GObjectClass parent_class;
} QuickUsbPluginClass;

FLUTTER_PLUGIN_EXPORT GType quick_usb_plugin_get_type();

FLUTTER_PLUGIN_EXPORT void quick_usb_plugin_register_with_registrar(
FlPluginRegistrar* registrar);

Expand Down
56 changes: 0 additions & 56 deletions packages/quick_usb/linux/quick_usb_plugin.cc
Original file line number Diff line number Diff line change
@@ -1,60 +1,4 @@
#include "include/quick_usb/quick_usb_plugin.h"

#include <flutter_linux/flutter_linux.h>
#include <gtk/gtk.h>
#include <sys/utsname.h>

#include <cstring>

#define QUICK_USB_PLUGIN(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), quick_usb_plugin_get_type(), \
QuickUsbPlugin))

struct _QuickUsbPlugin {
GObject parent_instance;
};

G_DEFINE_TYPE(QuickUsbPlugin, quick_usb_plugin, g_object_get_type())

// Called when a method call is received from Flutter.
static void quick_usb_plugin_handle_method_call(
QuickUsbPlugin* self,
FlMethodCall* method_call) {
g_autoptr(FlMethodResponse) response = nullptr;

response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());

fl_method_call_respond(method_call, response, nullptr);
}

static void quick_usb_plugin_dispose(GObject* object) {
G_OBJECT_CLASS(quick_usb_plugin_parent_class)->dispose(object);
}

static void quick_usb_plugin_class_init(QuickUsbPluginClass* klass) {
G_OBJECT_CLASS(klass)->dispose = quick_usb_plugin_dispose;
}

static void quick_usb_plugin_init(QuickUsbPlugin* self) {}

static void method_call_cb(FlMethodChannel* channel, FlMethodCall* method_call,
gpointer user_data) {
QuickUsbPlugin* plugin = QUICK_USB_PLUGIN(user_data);
quick_usb_plugin_handle_method_call(plugin, method_call);
}

void quick_usb_plugin_register_with_registrar(FlPluginRegistrar* registrar) {
QuickUsbPlugin* plugin = QUICK_USB_PLUGIN(
g_object_new(quick_usb_plugin_get_type(), nullptr));

g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
g_autoptr(FlMethodChannel) channel =
fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar),
"quick_usb",
FL_METHOD_CODEC(codec));
fl_method_channel_set_method_call_handler(channel, method_call_cb,
g_object_ref(plugin),
g_object_unref);

g_object_unref(plugin);
}
14 changes: 0 additions & 14 deletions packages/quick_usb/macos/Classes/QuickUsbPlugin.swift

This file was deleted.

1 change: 0 additions & 1 deletion packages/quick_usb/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ flutter:
pluginClass: QuickUsbPlugin
dartPluginClass: QuickUsbWindows
macos:
pluginClass: QuickUsbPlugin
dartPluginClass: QuickUsbMacos
linux:
pluginClass: QuickUsbPlugin
Expand Down
64 changes: 0 additions & 64 deletions packages/quick_usb/windows/quick_usb_plugin.cpp
Original file line number Diff line number Diff line change
@@ -1,69 +1,5 @@
#include "include/quick_usb/quick_usb_plugin.h"

// This must be included before many other Windows headers.
#include <windows.h>

// For getPlatformVersion; remove unless needed for your plugin implementation.
#include <VersionHelpers.h>

#include <flutter/method_channel.h>
#include <flutter/plugin_registrar_windows.h>
#include <flutter/standard_method_codec.h>

#include <map>
#include <memory>
#include <sstream>

namespace {

class QuickUsbPlugin : public flutter::Plugin {
public:
static void RegisterWithRegistrar(flutter::PluginRegistrarWindows *registrar);

QuickUsbPlugin();

virtual ~QuickUsbPlugin();

private:
// Called when a method is called on this plugin's channel from Dart.
void HandleMethodCall(
const flutter::MethodCall<flutter::EncodableValue> &method_call,
std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
};

// static
void QuickUsbPlugin::RegisterWithRegistrar(
flutter::PluginRegistrarWindows *registrar) {
auto channel =
std::make_unique<flutter::MethodChannel<flutter::EncodableValue>>(
registrar->messenger(), "quick_usb",
&flutter::StandardMethodCodec::GetInstance());

auto plugin = std::make_unique<QuickUsbPlugin>();

channel->SetMethodCallHandler(
[plugin_pointer = plugin.get()](const auto &call, auto result) {
plugin_pointer->HandleMethodCall(call, std::move(result));
});

registrar->AddPlugin(std::move(plugin));
}

QuickUsbPlugin::QuickUsbPlugin() {}

QuickUsbPlugin::~QuickUsbPlugin() {}

void QuickUsbPlugin::HandleMethodCall(
const flutter::MethodCall<flutter::EncodableValue> &method_call,
std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
result->NotImplemented();
}

} // namespace

void QuickUsbPluginRegisterWithRegistrar(
FlutterDesktopPluginRegistrarRef registrar) {
QuickUsbPlugin::RegisterWithRegistrar(
flutter::PluginRegistrarManager::GetInstance()
->GetRegistrar<flutter::PluginRegistrarWindows>(registrar));
}

0 comments on commit 8e5ac31

Please sign in to comment.