From 9b6359494209eaa95dcd6dbf776d7627f2ad7c69 Mon Sep 17 00:00:00 2001
From: Roman Buldygin <froooks@gmail.com>
Date: Sun, 12 Nov 2023 04:05:01 +0300
Subject: [PATCH] Android demo fix

---
 src/Rtl8812auNet.AndroidDemo/MainPage.xaml    | 10 +-
 src/Rtl8812auNet.AndroidDemo/MainPage.xaml.cs | 95 ++++++++++++++-----
 src/Rtl8812auNet.AndroidDemo/MauiProgram.cs   |  2 +-
 .../Android/AndroidServiceManager.cs          | 32 +++++++
 .../Android/DriverBackgroundService.cs        | 57 +++++++++++
 .../Platforms/Android/MainActivity.cs         | 19 ++++
 .../Platforms/MacCatalyst/AppDelegate.cs      | 10 --
 .../Platforms/MacCatalyst/Info.plist          | 30 ------
 .../Platforms/MacCatalyst/Program.cs          | 17 ----
 .../Platforms/Tizen/Main.cs                   | 18 ----
 .../Platforms/Tizen/tizen-manifest.xml        | 15 ---
 .../Platforms/iOS/AppDelegate.cs              | 10 --
 .../Platforms/iOS/Info.plist                  | 32 -------
 .../Platforms/iOS/Program.cs                  | 17 ----
 .../Rtl8812auNet.AndroidDemo.csproj           | 34 ++++---
 .../RtlUsb/RtlUsbDevice.cs                    | 42 ++++++--
 src/Rtl8812auNet.ConsoleDemo/Program.cs       |  2 +-
 src/Rtl8812auNet/WiFiDriver.cs                | 45 +++++++--
 src/WiFiDriver.sln                            | 16 +++-
 19 files changed, 290 insertions(+), 213 deletions(-)
 create mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/Android/AndroidServiceManager.cs
 create mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/Android/DriverBackgroundService.cs
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/AppDelegate.cs
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Info.plist
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Program.cs
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/Main.cs
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/tizen-manifest.xml
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/iOS/AppDelegate.cs
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Info.plist
 delete mode 100644 src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Program.cs

diff --git a/src/Rtl8812auNet.AndroidDemo/MainPage.xaml b/src/Rtl8812auNet.AndroidDemo/MainPage.xaml
index 9cf38aa..a0f2152 100644
--- a/src/Rtl8812auNet.AndroidDemo/MainPage.xaml
+++ b/src/Rtl8812auNet.AndroidDemo/MainPage.xaml
@@ -16,22 +16,20 @@
                 HorizontalOptions="Center" />
 
             <Label
-                Text="Hello, World!"
+                Text="OHD receiver"
                 SemanticProperties.HeadingLevel="Level1"
                 FontSize="32"
                 HorizontalOptions="Center" />
 
             <Label
-                Text="Welcome to .NET Multi-platform App UI"
-                SemanticProperties.HeadingLevel="Level2"
-                SemanticProperties.Description="Welcome to dot net Multi platform App U I"
+                x:Name="StatusLabel"
+                Text="Push the button!"
                 FontSize="18"
                 HorizontalOptions="Center" />
 
             <Button
                 x:Name="CounterBtn"
-                Text="Click me"
-                SemanticProperties.Hint="Counts the number of times you click"
+                Text="Start"
                 Clicked="OnCounterClicked"
                 HorizontalOptions="Center" />
 
diff --git a/src/Rtl8812auNet.AndroidDemo/MainPage.xaml.cs b/src/Rtl8812auNet.AndroidDemo/MainPage.xaml.cs
index dce2b88..9df3fa2 100644
--- a/src/Rtl8812auNet.AndroidDemo/MainPage.xaml.cs
+++ b/src/Rtl8812auNet.AndroidDemo/MainPage.xaml.cs
@@ -1,39 +1,88 @@
-using Android.App;
+using System.Net;
+
+using Android.App;
 using Android.Content;
 using Android.Hardware.Usb;
+using LibUsbDotNet.Main;
+using Rtl8812auNet.AndroidDemo.Platforms.Android;
 using Rtl8812auNet.AndroidDemo.RtlUsb;
 using Rtl8812auNet.Rtl8812au;
 using Application = Android.App.Application;
 
-namespace Rtl8812auNet.AndroidDemo
+namespace Rtl8812auNet.AndroidDemo;
+
+public partial class MainPage : ContentPage
 {
-    public partial class MainPage : ContentPage
+    private static string ACTION_USB_PERMISSION = "zone.bld.receiverapp.USB_PERMISSION";
+    private readonly MyBroadcastReceiver _broadcastReceiver;
+
+    public MainPage()
+    {
+        InitializeComponent();
+        _broadcastReceiver = new MyBroadcastReceiver(this);
+    }
+
+    private void OnCounterClicked(object sender, EventArgs e)
+    {
+        var context = Android.App.Application.Context;
+        var usbManager = (UsbManager)context.GetSystemService(Android.Content.Context.UsbService);
+
+        var (_, device) = usbManager.DeviceList.FirstOrDefault(pair => pair.Value.ManufacturerName == "Realtek");
+        if (device != null)
+        {
+            if (usbManager.HasPermission(device))
+            {
+                StatusLabel.Text = $"Device found:{device.DeviceName}" + System.Environment.NewLine + "Starting...";
+                StartService(device);
+            }
+            else
+            {
+                var pi = PendingIntent.GetBroadcast(
+                    Android.App.Application.Context,
+                    0,
+                    new Intent(ACTION_USB_PERMISSION),
+                    PendingIntentFlags.Immutable);
+                _broadcastReceiver.Dev = device;
+                var filter = new IntentFilter(ACTION_USB_PERMISSION);
+                context.RegisterReceiver(_broadcastReceiver, filter);
+
+                StatusLabel.Text = $"Device found:{device.DeviceName}" + System.Environment.NewLine + "Requesting permissions...";
+                usbManager.RequestPermission(device, pi);
+            }
+        }
+        else
+        {
+            StatusLabel.Text = "No RTL8812AU device found";
+        }
+
+        Console.WriteLine("READY");
+    }
+
+    private void StartService(UsbDevice device)
     {
-        int count = 0;
+        StatusLabel.Text = $"Device found:{device.DeviceName}" + System.Environment.NewLine + "Starting...";
+        AndroidServiceManager.Device = device;
+        var context = Android.App.Application.Context;
+        var usbManager = (UsbManager)context.GetSystemService(Android.Content.Context.UsbService);
+        AndroidServiceManager.Connection = usbManager.OpenDevice(device);
+        AndroidServiceManager.StartWfbService();
+    }
 
-        public MainPage()
+    public class MyBroadcastReceiver : BroadcastReceiver
+    {
+        private readonly MainPage _parent;
+
+        public MyBroadcastReceiver(MainPage parent)
         {
-            InitializeComponent();
+            _parent = parent;
         }
 
-        private void OnCounterClicked(object sender, EventArgs e)
+        public override void OnReceive(Context context, Intent intent)
         {
-            var context = Android.App.Application.Context;
-            var usbManager = (UsbManager)context.GetSystemService(Android.Content.Context.UsbService);
-            var dev = usbManager.DeviceList.Single(pair => pair.Value.ManufacturerName == "Realtek").Value;
-            var pi = PendingIntent.GetBroadcast(
-                Application.Context,
-                0,
-                new Intent(Context.UsbService),
-                PendingIntentFlags.Immutable);
-            usbManager.RequestPermission(dev, pi);
-
-            var conn = usbManager.OpenDevice(dev);
-            var rtlUsbDevice = new RtlUsbDevice(dev, conn);
-            var rtl = new Rtl8812aDevice(rtlUsbDevice);
-            rtl.Init();
-
-            Console.WriteLine("READY");
+            _parent.StatusLabel.Text = $"Device found:{Dev.DeviceName}" + System.Environment.NewLine + "Starting...";
+            _parent.StartService(Dev);
         }
+
+        public UsbDevice Dev { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/MauiProgram.cs b/src/Rtl8812auNet.AndroidDemo/MauiProgram.cs
index 7379cda..a9dc7e3 100644
--- a/src/Rtl8812auNet.AndroidDemo/MauiProgram.cs
+++ b/src/Rtl8812auNet.AndroidDemo/MauiProgram.cs
@@ -16,7 +16,7 @@ public static MauiApp CreateMauiApp()
                 });
 
 #if DEBUG
-		builder.Logging.AddDebug();
+		builder.Logging.AddDebug().SetMinimumLevel(LogLevel.Trace);
 #endif
 
             return builder.Build();
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/Android/AndroidServiceManager.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/Android/AndroidServiceManager.cs
new file mode 100644
index 0000000..f3544de
--- /dev/null
+++ b/src/Rtl8812auNet.AndroidDemo/Platforms/Android/AndroidServiceManager.cs
@@ -0,0 +1,32 @@
+using Android.Hardware.Usb;
+
+namespace Rtl8812auNet.AndroidDemo.Platforms.Android;
+
+public static class AndroidServiceManager
+{
+    public static MainActivity MainActivity { get; set; }
+
+    public static bool IsRunning { get; set; }
+    public static UsbDevice Device { get; set; }
+    public static UsbDeviceConnection Connection { get; set; }
+
+    public static void StartWfbService()
+    {
+        if (MainActivity == null)
+        {
+            return;
+        }
+
+        MainActivity.StartService();
+    }
+
+    public static void StopWfbService()
+    {
+        if (MainActivity == null)
+        {
+            return;
+        }
+        MainActivity.StopService();
+        IsRunning = false;
+    }
+}
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/Android/DriverBackgroundService.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/Android/DriverBackgroundService.cs
new file mode 100644
index 0000000..7a0a245
--- /dev/null
+++ b/src/Rtl8812auNet.AndroidDemo/Platforms/Android/DriverBackgroundService.cs
@@ -0,0 +1,57 @@
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Bld.WlanUtils;
+using Java.Util.Logging;
+
+using LibUsbDotNet.LibUsb;
+using Microsoft.Extensions.Logging;
+using Rtl8812auNet.AndroidDemo.RtlUsb;
+using Rtl8812auNet.Rtl8812au;
+using Rtl8812auNet.Rtl8812au.Models;
+using ChannelWidth = Rtl8812auNet.Rtl8812au.Enumerations.ChannelWidth;
+
+namespace Rtl8812auNet.AndroidDemo.Platforms.Android;
+
+[Service]
+public class DriverBackgroundService : Service
+{
+    private WiFiDriver _driver;
+    private Rtl8812aDevice _device;
+    private ILogger<DriverBackgroundService> _logger;
+    private WlanChannel _channel = Channels.Ch036;
+
+
+    public override IBinder OnBind(Intent intent)
+    {
+        return null;
+    }
+
+    public override StartCommandResult OnStartCommand(Intent intent, StartCommandFlags flags, int startId)
+    {
+        var loggerFactory = IPlatformApplication.Current.Services.GetRequiredService<ILoggerFactory>();
+        _logger = loggerFactory.CreateLogger<DriverBackgroundService>();
+        _driver = new WiFiDriver(loggerFactory, false);
+        _device = _driver.CreateRtlDevice(new RtlUsbDevice(AndroidServiceManager.Device, AndroidServiceManager.Connection, loggerFactory.CreateLogger<RtlUsbDevice>()));
+        _device.Init(PacketProcessor, CreateCurrentChannel());
+        _device.SetMonitorChannel(CreateCurrentChannel());
+
+        return StartCommandResult.Sticky;
+    }
+
+    private Task PacketProcessor(ParsedRadioPacket arg)
+    {
+        _logger.LogDebug("Received");
+        return Task.CompletedTask;
+    }
+
+    private SelectedChannel CreateCurrentChannel()
+    {
+        return new SelectedChannel
+        {
+            Channel = (byte)_channel.ChannelNumber,
+            ChannelOffset = 0,
+            ChannelWidth = ChannelWidth.CHANNEL_WIDTH_20
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/Android/MainActivity.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/Android/MainActivity.cs
index 4078ed3..5a52e66 100644
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/Android/MainActivity.cs
+++ b/src/Rtl8812auNet.AndroidDemo/Platforms/Android/MainActivity.cs
@@ -1,11 +1,30 @@
 using Android.App;
+using Android.Content;
 using Android.Content.PM;
 using Android.OS;
+using Rtl8812auNet.AndroidDemo.Platforms.Android;
 
 namespace Rtl8812auNet.AndroidDemo
 {
     [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
     public class MainActivity : MauiAppCompatActivity
     {
+        public MainActivity()
+        {
+            AndroidServiceManager.MainActivity = this;
+        }
+
+        public void StartService()
+        {
+            var serviceIntent = new Intent(this, typeof(DriverBackgroundService));
+            serviceIntent.PutExtra("inputExtra", "Background Service");
+            StartService(serviceIntent);
+        }
+
+        public void StopService()
+        {
+            var serviceIntent = new Intent(this, typeof(DriverBackgroundService));
+            StopService(serviceIntent);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/AppDelegate.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/AppDelegate.cs
deleted file mode 100644
index e9de277..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/AppDelegate.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Foundation;
-
-namespace Rtl8812auNet.AndroidDemo
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : MauiUIApplicationDelegate
-    {
-        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-    }
-}
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Info.plist b/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Info.plist
deleted file mode 100644
index c96dd0a..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Info.plist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/appicon.appiconset</string>
-</dict>
-</plist>
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Program.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Program.cs
deleted file mode 100644
index 1060ef9..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/MacCatalyst/Program.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using ObjCRuntime;
-
-using UIKit;
-
-namespace Rtl8812auNet.AndroidDemo
-{
-    public class Program
-    {
-        // This is the main entry point of the application.
-        static void Main(string[] args)
-        {
-            // if you want to use a different Application Delegate class from "AppDelegate"
-            // you can specify it here.
-            UIApplication.Main(args, null, typeof(AppDelegate));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/Main.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/Main.cs
deleted file mode 100644
index 62b1063..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/Main.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-using Microsoft.Maui;
-using Microsoft.Maui.Hosting;
-
-namespace Rtl8812auNet.AndroidDemo
-{
-    internal class Program : MauiApplication
-    {
-        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-
-        static void Main(string[] args)
-        {
-            var app = new Program();
-            app.Run(args);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/tizen-manifest.xml b/src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/tizen-manifest.xml
deleted file mode 100644
index d954a02..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/Tizen/tizen-manifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
-  <profile name="common" />
-  <ui-application appid="maui-application-id-placeholder" exec="Rtl8812auNet.AndroidDemo.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
-    <label>maui-application-title-placeholder</label>
-    <icon>maui-appicon-placeholder</icon>
-    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
-  </ui-application>
-  <shortcut-list />
-  <privileges>
-    <privilege>http://tizen.org/privilege/internet</privilege>
-  </privileges> 
-  <dependencies />
-  <provides-appdefined-privileges />
-</manifest>
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/AppDelegate.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/AppDelegate.cs
deleted file mode 100644
index e9de277..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/AppDelegate.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Foundation;
-
-namespace Rtl8812auNet.AndroidDemo
-{
-    [Register("AppDelegate")]
-    public class AppDelegate : MauiUIApplicationDelegate
-    {
-        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-    }
-}
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Info.plist b/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Info.plist
deleted file mode 100644
index 0004a4f..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Info.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/appicon.appiconset</string>
-</dict>
-</plist>
diff --git a/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Program.cs b/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Program.cs
deleted file mode 100644
index 1060ef9..0000000
--- a/src/Rtl8812auNet.AndroidDemo/Platforms/iOS/Program.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using ObjCRuntime;
-
-using UIKit;
-
-namespace Rtl8812auNet.AndroidDemo
-{
-    public class Program
-    {
-        // This is the main entry point of the application.
-        static void Main(string[] args)
-        {
-            // if you want to use a different Application Delegate class from "AppDelegate"
-            // you can specify it here.
-            UIApplication.Main(args, null, typeof(AppDelegate));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Rtl8812auNet.AndroidDemo/Rtl8812auNet.AndroidDemo.csproj b/src/Rtl8812auNet.AndroidDemo/Rtl8812auNet.AndroidDemo.csproj
index 996b3da..f34a2c6 100644
--- a/src/Rtl8812auNet.AndroidDemo/Rtl8812auNet.AndroidDemo.csproj
+++ b/src/Rtl8812auNet.AndroidDemo/Rtl8812auNet.AndroidDemo.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0-android</TargetFramework>
+        <TargetFrameworks>net8.0-android;</TargetFrameworks>
+        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -14,7 +15,7 @@
 		<ApplicationTitle>Rtl8812auNet.AndroidDemo</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.rtl8812aunet.androiddemo</ApplicationId>
+		<ApplicationId>zone.bld.rtl8812aunet.androiddemo</ApplicationId>
 		<ApplicationIdGuid>5da40655-1990-4464-9287-d4c38b17498f</ApplicationIdGuid>
 
 		<!-- Versions -->
@@ -25,29 +26,34 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+        <!-- App Icon -->
+        <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
 
-		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+        <!-- Splash Screen -->
+        <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
 
-		<!-- Images -->
-		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
+        <!-- Images -->
+        <MauiImage Include="Resources\Images\*" />
+        <MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
 
-		<!-- Custom Fonts -->
-		<MauiFont Include="Resources\Fonts\*" />
+        <!-- Custom Fonts -->
+        <MauiFont Include="Resources\Fonts\*" />
 
-		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+        <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+        <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+        <PackageReference Include="Bld.WlanUtils" Version="0.2.0" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.2.23479.6" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Rtl8812auNet\Rtl8812auNet.csproj" />
 	</ItemGroup>
 
+	<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerExceptionRtl8812auNetAndroidDemoHideInfoBar="True" /></VisualStudio></ProjectExtensions>
+
 </Project>
diff --git a/src/Rtl8812auNet.AndroidDemo/RtlUsb/RtlUsbDevice.cs b/src/Rtl8812auNet.AndroidDemo/RtlUsb/RtlUsbDevice.cs
index 9c922f9..a23d735 100644
--- a/src/Rtl8812auNet.AndroidDemo/RtlUsb/RtlUsbDevice.cs
+++ b/src/Rtl8812auNet.AndroidDemo/RtlUsb/RtlUsbDevice.cs
@@ -1,29 +1,54 @@
-using Android.Hardware.Usb;
+using System.Threading.Channels;
+using Android.Hardware.Usb;
+using Microsoft.Extensions.Logging;
+
 using Rtl8812auNet.Abstractions;
 
 namespace Rtl8812auNet.AndroidDemo.RtlUsb
 {
     internal class RtlUsbDevice : IRtlUsbDevice
     {
+        private readonly Channel<byte[]> _bulkTransfersChannel = Channel.CreateUnbounded<byte[]>();
         private readonly UsbDevice _usbDevice;
         private readonly UsbDeviceConnection _usbDeviceConnection;
+        private readonly ILogger<RtlUsbDevice> _logger;
 
-        public RtlUsbDevice(UsbDevice usbDevice, UsbDeviceConnection usbDeviceConnection)
+        public RtlUsbDevice(
+            UsbDevice usbDevice,
+            UsbDeviceConnection usbDeviceConnection,
+            ILogger<RtlUsbDevice> logger)
         {
             _usbDevice = usbDevice;
             _usbDeviceConnection = usbDeviceConnection;
+            _logger = logger;
+
+            //_usbDevice.Open();
+            //_usbDevice.SetConfiguration(1);
+            //_usbDevice.ClaimInterface(0);
+
+            //_reader = _usbDevice.OpenEndpointReader(GetInEp());
         }
         public void InfinityRead()
         {
             var ep = GetInEp();
-
-            var buffer = new byte[4096];
+            var readBuffer = new byte[8192 + 1024];
             while (true)
             {
-                var readed = _usbDeviceConnection.BulkTransfer(ep, buffer, buffer.Length, 1000);
-                if (readed != 0)
+                try
                 {
-                    Console.WriteLine($"BULK {readed}");
+                    var length = _usbDeviceConnection.BulkTransfer(ep, readBuffer, readBuffer.Length, 0);
+                    if (length < 0)
+                    {
+                        _logger.LogError("BULK read ERR {result}", length);
+                    }
+                    else
+                    {
+                        _bulkTransfersChannel.Writer.TryWrite(readBuffer.AsSpan(0, length).ToArray());
+                    }
+                }
+                catch (Exception e)
+                {
+                    _logger.LogError(e, "_reader.Read error");
                 }
             }
         }
@@ -45,6 +70,9 @@ private UsbEndpoint GetInEp()
         }
 
         public int Speed { get; } = 3;
+
+        public ChannelReader<byte[]> BulkTransfersReader => _bulkTransfersChannel.Reader;
+
         public void WriteBytes(ushort register, Span<byte> data)
         {
             _usbDeviceConnection.ControlTransfer(
diff --git a/src/Rtl8812auNet.ConsoleDemo/Program.cs b/src/Rtl8812auNet.ConsoleDemo/Program.cs
index 4659cfd..421ca36 100644
--- a/src/Rtl8812auNet.ConsoleDemo/Program.cs
+++ b/src/Rtl8812auNet.ConsoleDemo/Program.cs
@@ -14,7 +14,7 @@ static void Main(string[] args)
                 .SetMinimumLevel(LogLevel.Trace)
                 .AddConsole());
 
-        using var driver = new WiFiDriver(loggerFactory);
+        using var driver = new WiFiDriver(loggerFactory, true);
         var devices = driver.GetUsbDevices();
         var device = devices.First();
 
diff --git a/src/Rtl8812auNet/WiFiDriver.cs b/src/Rtl8812auNet/WiFiDriver.cs
index d7eeb1a..fde9f18 100644
--- a/src/Rtl8812auNet/WiFiDriver.cs
+++ b/src/Rtl8812auNet/WiFiDriver.cs
@@ -1,5 +1,7 @@
 using LibUsbDotNet.LibUsb;
 using Microsoft.Extensions.Logging;
+
+using Rtl8812auNet.Abstractions;
 using Rtl8812auNet.LibUsbDotNet;
 using Rtl8812auNet.Rtl8812au;
 using Rtl8812auNet.Rtl8812au.Modules;
@@ -9,29 +11,41 @@ namespace Rtl8812auNet;
 public class WiFiDriver : IDisposable
 {
     private readonly ILoggerFactory _loggerFactory;
+    private readonly bool _isLibUsbMode;
     private readonly ILogger<WiFiDriver> _logger;
-    private readonly UsbContext _usbContext;
+    private readonly UsbContext? _usbContext;
 
-    public WiFiDriver(ILoggerFactory loggerFactory)
+    public WiFiDriver(
+        ILoggerFactory loggerFactory,
+        bool isLibUsbMode)
     {
         _loggerFactory = loggerFactory;
+        _isLibUsbMode = isLibUsbMode;
         _logger = loggerFactory.CreateLogger<WiFiDriver>();
 
-        _logger.LogTrace("Creating UsbContext");
-        _usbContext = new UsbContext();
-        _usbContext.StartHandlingEvents();
-        _usbContext.SetDebugLevel(global::LibUsbDotNet.LogLevel.Info);
-        _logger.LogTrace("LibUsbDotNet initialised");
+        if (isLibUsbMode)
+        {
+            _logger.LogTrace("Creating UsbContext");
+            _usbContext = new UsbContext();
+            _usbContext.StartHandlingEvents();
+            _usbContext.SetDebugLevel(global::LibUsbDotNet.LogLevel.Info);
+            _logger.LogTrace("LibUsbDotNet initialised");
+        }
     }
 
     public List<IUsbDevice> GetUsbDevices()
     {
+        if (_usbContext == null)
+        {
+            throw new Exception("Not in libusb mode");
+        }
+
         return _usbContext.FindAll(SearchPredicate).ToList();
     }
 
     public Rtl8812aDevice CreateRtlDevice(IUsbDevice usbDevice)
     {
-        _logger.LogInformation("Creating Rtl8812aDevice");
+        _logger.LogInformation("Creating Rtl8812aDevice from IUsbDevice(LibUSB)");
         var usb = new LibUsbRtlUsbDevice(
             (UsbDevice)usbDevice,
             _loggerFactory.CreateLogger<LibUsbRtlUsbDevice>());
@@ -45,9 +59,22 @@ public Rtl8812aDevice CreateRtlDevice(IUsbDevice usbDevice)
             _loggerFactory.CreateLogger<FirmwareManager>());
     }
 
+    public Rtl8812aDevice CreateRtlDevice(IRtlUsbDevice usbDevice)
+    {
+        _logger.LogInformation("Creating Rtl8812aDevice from IRtlUsbDevice");
+        var rtlAdapter = new RtlUsbAdapter(usbDevice, _loggerFactory.CreateLogger<RtlUsbAdapter>());
+        return new Rtl8812aDevice(
+            rtlAdapter,
+            _loggerFactory.CreateLogger<Rtl8812aDevice>(),
+            _loggerFactory.CreateLogger<EepromManager>(),
+            _loggerFactory.CreateLogger<HalModule>(),
+            _loggerFactory.CreateLogger<FrameParser>(),
+            _loggerFactory.CreateLogger<FirmwareManager>());
+    }
+
     public void Dispose()
     {
-        _usbContext.Dispose();
+        _usbContext?.Dispose();
     }
 
     private static bool SearchPredicate(IUsbDevice device)
diff --git a/src/WiFiDriver.sln b/src/WiFiDriver.sln
index 88a6301..257ecc1 100644
--- a/src/WiFiDriver.sln
+++ b/src/WiFiDriver.sln
@@ -16,7 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protos", "Protos", "{FB6533
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClientApplications", "ClientApplications", "{7B609A23-9CEE-4D88-89C1-8DB3F3CDD98C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHdDriver.Windows", "OpenHdDriver.Windows\OpenHdDriver.Windows.csproj", "{67241F81-CCB9-4812-AD28-D8BCD4CC432D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenHdDriver.Windows", "OpenHdDriver.Windows\OpenHdDriver.Windows.csproj", "{67241F81-CCB9-4812-AD28-D8BCD4CC432D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9406BE10-25CC-4FBB-9168-5305196DA0BC}"
 	ProjectSection(SolutionItems) = preProject
@@ -25,14 +25,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{8BD19631-7C77-4DD8-A029-814F70D97F9C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rtl8812auNet.AndroidDemo", "Rtl8812auNet.AndroidDemo\Rtl8812auNet.AndroidDemo.csproj", "{A7578F4D-6EB4-4033-A642-CBD1AE74782A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BD19631-7C77-4DD8-A029-814F70D97F9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BD19631-7C77-4DD8-A029-814F70D97F9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1BF46D4-DBB1-465A-AD30-515B55918513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1BF46D4-DBB1-465A-AD30-515B55918513}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1BF46D4-DBB1-465A-AD30-515B55918513}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,12 +49,22 @@ Global
 		{67241F81-CCB9-4812-AD28-D8BCD4CC432D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67241F81-CCB9-4812-AD28-D8BCD4CC432D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67241F81-CCB9-4812-AD28-D8BCD4CC432D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BD19631-7C77-4DD8-A029-814F70D97F9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BD19631-7C77-4DD8-A029-814F70D97F9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7578F4D-6EB4-4033-A642-CBD1AE74782A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7578F4D-6EB4-4033-A642-CBD1AE74782A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7578F4D-6EB4-4033-A642-CBD1AE74782A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{A7578F4D-6EB4-4033-A642-CBD1AE74782A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7578F4D-6EB4-4033-A642-CBD1AE74782A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7578F4D-6EB4-4033-A642-CBD1AE74782A}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{E42C6D7F-684A-4AE7-85FD-E04CCC20D671} = {7B609A23-9CEE-4D88-89C1-8DB3F3CDD98C}
 		{67241F81-CCB9-4812-AD28-D8BCD4CC432D} = {7B609A23-9CEE-4D88-89C1-8DB3F3CDD98C}
+		{A7578F4D-6EB4-4033-A642-CBD1AE74782A} = {7B609A23-9CEE-4D88-89C1-8DB3F3CDD98C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {ACCC2971-DFBF-4B33-AA8B-2C34422F876B}