liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

xfer

Browse Source
This commit is contained in:
John Smith
2022-01-29 13:18:28 -05:00
parent 0c6aa6d439
commit 681c65b68c
3 changed files with 91 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/keyring-manager vendored

Submodule external/keyring-manager updated: 935ca957d7...1295d708ec

68
veilid-flutter/linux/veilid_plugin.cc
View File

@@ -18,27 +18,27 @@ struct _VeilidPlugin
G_DEFINE_TYPE(VeilidPlugin, veilid_plugin, g_object_get_type()) G_DEFINE_TYPE(VeilidPlugin, veilid_plugin, g_object_get_type())
// Called when a method call is received from Flutter. // Called when a method call is received from Flutter.
static void veilid_plugin_handle_method_call( // static void veilid_plugin_handle_method_call(
VeilidPlugin *self, // VeilidPlugin *self,
FlMethodCall *method_call) // FlMethodCall *method_call)
{ // {
g_autoptr(FlMethodResponse) response = nullptr; // g_autoptr(FlMethodResponse) response = nullptr;
//const gchar *method = fl_method_call_get_name(method_call); // //const gchar *method = fl_method_call_get_name(method_call);
// if (strcmp(method, "getPlatformVersion") == 0) { // // if (strcmp(method, "getPlatformVersion") == 0) {
// struct utsname uname_data = {}; // // struct utsname uname_data = {};
// uname(&uname_data); // // uname(&uname_data);
// g_autofree gchar *version = g_strdup_printf("Linux %s", uname_data.version); // // g_autofree gchar *version = g_strdup_printf("Linux %s", uname_data.version);
// g_autoptr(FlValue) result = fl_value_new_string(version); // // g_autoptr(FlValue) result = fl_value_new_string(version);
// response = FL_METHOD_RESPONSE(fl_method_success_response_new(result)); // // response = FL_METHOD_RESPONSE(fl_method_success_response_new(result));
// } else { // // } else {
response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new()); // response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
// // }
// fl_method_call_respond(method_call, response, nullptr);
// } // }
fl_method_call_respond(method_call, response, nullptr);
}
static void veilid_plugin_dispose(GObject *object) static void veilid_plugin_dispose(GObject *object)
{ {
G_OBJECT_CLASS(veilid_plugin_parent_class)->dispose(object); G_OBJECT_CLASS(veilid_plugin_parent_class)->dispose(object);
@@ -51,26 +51,26 @@ static void veilid_plugin_class_init(VeilidPluginClass *klass)
static void veilid_plugin_init(VeilidPlugin *self) {} static void veilid_plugin_init(VeilidPlugin *self) {}
static void method_call_cb(FlMethodChannel *channel, FlMethodCall *method_call, // static void method_call_cb(FlMethodChannel *channel, FlMethodCall *method_call,
gpointer user_data) // gpointer user_data)
{ // {
VeilidPlugin *plugin = VEILID_PLUGIN(user_data); // VeilidPlugin *plugin = VEILID_PLUGIN(user_data);
veilid_plugin_handle_method_call(plugin, method_call); // veilid_plugin_handle_method_call(plugin, method_call);
} // }
void veilid_plugin_register_with_registrar(FlPluginRegistrar *registrar) void veilid_plugin_register_with_registrar(FlPluginRegistrar *registrar)
{ {
VeilidPlugin *plugin = VEILID_PLUGIN( // VeilidPlugin *plugin = VEILID_PLUGIN(
g_object_new(veilid_plugin_get_type(), nullptr)); // g_object_new(veilid_plugin_get_type(), nullptr));
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); // g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
g_autoptr(FlMethodChannel) channel = // g_autoptr(FlMethodChannel) channel =
fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar), // fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar),
"veilid", // "veilid",
FL_METHOD_CODEC(codec)); // FL_METHOD_CODEC(codec));
fl_method_channel_set_method_call_handler(channel, method_call_cb, // fl_method_channel_set_method_call_handler(channel, method_call_cb,
g_object_ref(plugin), // g_object_ref(plugin),
g_object_unref); // g_object_unref);
g_object_unref(plugin); // g_object_unref(plugin);
} }

44
veilid-flutter/windows/veilid_plugin.cpp
View File

@@ -14,9 +14,11 @@
#include <memory> #include <memory>
#include <sstream> #include <sstream>
namespace { namespace
{
class VeilidPlugin : public flutter::Plugin { class VeilidPlugin : public flutter::Plugin
{
public: public:
static void RegisterWithRegistrar(flutter::PluginRegistrarWindows *registrar); static void RegisterWithRegistrar(flutter::PluginRegistrarWindows *registrar);
@@ -33,7 +35,8 @@ class VeilidPlugin : public flutter::Plugin {
// static // static
void VeilidPlugin::RegisterWithRegistrar( void VeilidPlugin::RegisterWithRegistrar(
flutter::PluginRegistrarWindows *registrar) { flutter::PluginRegistrarWindows *registrar)
{
auto channel = auto channel =
std::make_unique<flutter::MethodChannel<flutter::EncodableValue>>( std::make_unique<flutter::MethodChannel<flutter::EncodableValue>>(
registrar->messenger(), "veilid", registrar->messenger(), "veilid",
@@ -42,7 +45,8 @@ void VeilidPlugin::RegisterWithRegistrar(
auto plugin = std::make_unique<VeilidPlugin>(); auto plugin = std::make_unique<VeilidPlugin>();
channel->SetMethodCallHandler( channel->SetMethodCallHandler(
[plugin_pointer = plugin.get()](const auto &call, auto result) { [plugin_pointer = plugin.get()](const auto &call, auto result)
{
plugin_pointer->HandleMethodCall(call, std::move(result)); plugin_pointer->HandleMethodCall(call, std::move(result));
}); });
@@ -55,27 +59,29 @@ VeilidPlugin::~VeilidPlugin() {}
void VeilidPlugin::HandleMethodCall( void VeilidPlugin::HandleMethodCall(
const flutter::MethodCall<flutter::EncodableValue> &method_call, const flutter::MethodCall<flutter::EncodableValue> &method_call,
std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) { std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result)
if (method_call.method_name().compare("getPlatformVersion") == 0) { {
std::ostringstream version_stream; // if (method_call.method_name().compare("getPlatformVersion") == 0) {
version_stream << "Windows "; // std::ostringstream version_stream;
if (IsWindows10OrGreater()) { // version_stream << "Windows ";
version_stream << "10+"; // if (IsWindows10OrGreater()) {
} else if (IsWindows8OrGreater()) { // version_stream << "10+";
version_stream << "8"; // } else if (IsWindows8OrGreater()) {
} else if (IsWindows7OrGreater()) { // version_stream << "8";
version_stream << "7"; // } else if (IsWindows7OrGreater()) {
} // version_stream << "7";
result->Success(flutter::EncodableValue(version_stream.str())); // }
} else { // result->Success(flutter::EncodableValue(version_stream.str()));
// } else {
result->NotImplemented(); result->NotImplemented();
} // }
} }
} // namespace } // namespace
void VeilidPluginRegisterWithRegistrar( void VeilidPluginRegisterWithRegistrar(
FlutterDesktopPluginRegistrarRef registrar) { FlutterDesktopPluginRegistrarRef registrar)
{
VeilidPlugin::RegisterWithRegistrar( VeilidPlugin::RegisterWithRegistrar(
flutter::PluginRegistrarManager::GetInstance() flutter::PluginRegistrarManager::GetInstance()
->GetRegistrar<flutter::PluginRegistrarWindows>(registrar)); ->GetRegistrar<flutter::PluginRegistrarWindows>(registrar));