Merge pull request #116

develop

Laerdal.McuMgr.Bindings.Android.Native/settings.gradle

@@ -12,6 +12,6 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "LaerdalMcuMgrWrapperAndSampleApp"
+rootProject.name = "LaerdalMcuMgrWrapper"
 include ':app'
 include ':mcumgr-laerdal-wrapper'

Laerdal.McuMgr.Tests/FileDownloader/FileDownloaderTestbed.cs

@@ -66,6 +66,10 @@ public void FatalErrorOccurredAdvertisement(string resource, string errorMessage
 
             public void FileDownloadProgressPercentageAndDataThroughputChangedAdvertisement(int progressPercentage, float averageThroughput)
                 => _downloaderCallbacksProxy.FileDownloadProgressPercentageAndDataThroughputChangedAdvertisement(progressPercentage, averageThroughput); //raises the actual event
+
+            public void Dispose()
+            {
+            }
         }
     }
 }

Laerdal.McuMgr.Tests/FileUploader/FileUploaderTestbed.cs

@@ -74,6 +74,14 @@ public void FileUploadProgressPercentageAndDataThroughputChangedAdvertisement(in
             public bool TrySetContext(object context) => throw new NotImplementedException();
             public bool TrySetBluetoothDevice(object bluetoothDevice) => throw new NotImplementedException();
             public bool TryInvalidateCachedTransport() => throw new NotImplementedException();
+
+            public void Dispose()
+            {
+            }
+
+            public void CleanupResourcesOfLastUpload()
+            {
+            }
         }
     }
 }

Laerdal.McuMgr.Tests/FirmwareInstaller/FirmwareInstallerTestbed.cs

@@ -74,6 +74,14 @@ public void FatalErrorOccurredAdvertisement(EFirmwareInstallationState state, EF
 
             public void FirmwareUploadProgressPercentageAndDataThroughputChangedAdvertisement(int progressPercentage, float averageThroughput)
                 => _firmwareInstallerCallbacksProxy.FirmwareUploadProgressPercentageAndDataThroughputChangedAdvertisement(progressPercentage, averageThroughput); //raises the actual event
+
+            public void CleanupResourcesOfLastInstallation()
+            {
+            }
+
+            public void Dispose()
+            {
+            }
         }
     }
 }

Laerdal.McuMgr/Droid/FileDownloader/FileDownloader.cs

@@ -57,7 +57,39 @@ internal AndroidFileDownloaderProxy(INativeFileDownloaderCallbacksProxy fileDown
                 _fileDownloaderCallbacksProxy = fileDownloaderCallbacksProxy ?? throw new ArgumentNullException(nameof(fileDownloaderCallbacksProxy));
             }
 
+            // public new void Dispose() { ... }    dont   there is no need to override the base implementation
+
+            private bool _alreadyDisposed;
+            protected override void Dispose(bool disposing)
+            {
+                if (_alreadyDisposed)
+                {
+                    base.Dispose(disposing); //vital
+                    return;
+                }
+
+                if (disposing)
+                {                   
+                    CleanupInfrastructure();
+                }
+
+                _alreadyDisposed = true;
+
+                base.Dispose(disposing);
+            }
 
+            private void CleanupInfrastructure()
+            {
+                try
+                {
+                    Disconnect();
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+
             #region commands 
 
             public new EFileDownloaderVerdict BeginDownload(string remoteFilePath)
@@ -66,7 +98,6 @@ internal AndroidFileDownloaderProxy(INativeFileDownloaderCallbacksProxy fileDown
             }
 
             #endregion commands
-
 
 
             #region android callbacks -> csharp event emitters

Laerdal.McuMgr/Droid/FileUploader/FileUploader.cs

@@ -58,7 +58,45 @@ internal AndroidFileUploaderProxy(INativeFileUploaderCallbacksProxy fileUploader
             {
                 _fileUploaderCallbacksProxy = fileUploaderCallbacksProxy ?? throw new ArgumentNullException(nameof(fileUploaderCallbacksProxy));
             }
+
+            // public new void Dispose() { ... }    dont   there is no need to override the base implementation
+
+            private bool _alreadyDisposed;
+            protected override void Dispose(bool disposing)
+            {
+                if (_alreadyDisposed)
+                {
+                    base.Dispose(disposing); //vital
+                    return;
+                }
 
+                if (disposing)
+                {                   
+                    CleanupInfrastructure();
+                }
+
+                _alreadyDisposed = true;
+
+                base.Dispose(disposing);
+            }
+
+            private void CleanupInfrastructure()
+            {
+                try
+                {
+                    Disconnect();
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+
+            public void CleanupResourcesOfLastUpload()
+            {
+                //nothing to do in android
+            }
+
             #region commands
 
             public new EFileUploaderVerdict BeginUpload(string remoteFilePath, byte[] data)

Laerdal.McuMgr/Droid/FirmwareInstaller/FirmwareInstaller.cs

@@ -58,6 +58,46 @@ internal AndroidFirmwareInstallerProxy(INativeFirmwareInstallerCallbacksProxy fi
             {
                 _firmwareInstallerCallbacksProxy = firmwareInstallerCallbacksProxy ?? throw new ArgumentNullException(nameof(firmwareInstallerCallbacksProxy));
             }
+
+            // public new void Dispose() { ... }    dont   there is no need to override the base implementation
+
+            private bool _alreadyDisposed;
+            protected override void Dispose(bool disposing)
+            {
+                if (_alreadyDisposed)
+                {
+                    base.Dispose(disposing); //vital
+                    return;
+                }
+
+                if (disposing)
+                {                   
+                    CleanupInfrastructure();
+                }
+
+                _alreadyDisposed = true;
+
+                base.Dispose(disposing);
+            }
+
+            private void CleanupInfrastructure()
+            {
+                try
+                {
+                    Disconnect();
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+
+            public void CleanupResourcesOfLastInstallation()
+            {
+                //nothing to do here for android   only ios needs this
+            }
+
+            #region commands
 
             public EFirmwareInstallationVerdict BeginInstallation(
                 byte[] data,
@@ -83,6 +123,10 @@ public EFirmwareInstallationVerdict BeginInstallation(
 
                 return TranslateFirmwareInstallationVerdict(nativeVerdict);
             }
+
+            #endregion
+
+            #region callbacks -> events
 
             public override void FatalErrorOccurredAdvertisement(EAndroidFirmwareInstallationState state, EAndroidFirmwareInstallerFatalErrorType fatalErrorType, string errorMessage)
             {
@@ -164,6 +208,8 @@ public override void FirmwareUploadProgressPercentageAndDataThroughputChangedAdv
                     progressPercentage: progressPercentage
                 );
             }
+
+            #endregion
 
             static private EAndroidFirmwareInstallationMode TranslateFirmwareInstallationMode(EFirmwareInstallationMode mode) => mode switch
             {

Laerdal.McuMgr/Shared/FileDownloader/Contracts/IFileDownloader.cs

@@ -1,11 +1,17 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable EventNeverSubscribedTo.Global
 
+using System;
+
 namespace Laerdal.McuMgr.FileDownloader.Contracts
 {
     /// <summary>Downloads a file on a specific Nordic-chip-based BLE device</summary>
     /// <remarks>For the file-downloading process to even commence you need to be authenticated with the AED device that's being targeted.</remarks>
-    public interface IFileDownloader : IFileDownloaderCommandable, IFileDownloaderQueryable, IFileDownloaderEventSubscribable
+    public interface IFileDownloader :
+        IFileDownloaderCommandable,
+        IFileDownloaderQueryable,
+        IFileDownloaderEventSubscribable,
+        IDisposable
     {
     }
 }

Laerdal.McuMgr/Shared/FileDownloader/Contracts/Native/INativeFileDownloaderProxy.cs

@@ -1,6 +1,12 @@
-namespace Laerdal.McuMgr.FileDownloader.Contracts.Native
+using System;
+
+namespace Laerdal.McuMgr.FileDownloader.Contracts.Native
 {
-    internal interface INativeFileDownloaderProxy : INativeFileDownloaderQueryableProxy, INativeFileDownloaderCommandableProxy, INativeFileDownloaderCallbacksProxy
+    internal interface INativeFileDownloaderProxy :
+        INativeFileDownloaderQueryableProxy,
+        INativeFileDownloaderCommandableProxy,
+        INativeFileDownloaderCallbacksProxy,
+        IDisposable
     {
     }
 }

Laerdal.McuMgr/Shared/FileDownloader/FileDownloader.cs

@@ -28,6 +28,13 @@ internal FileDownloader(INativeFileDownloaderProxy nativeFileDownloaderProxy)
             _nativeFileDownloaderProxy = nativeFileDownloaderProxy ?? throw new ArgumentNullException(nameof(nativeFileDownloaderProxy));
             _nativeFileDownloaderProxy.FileDownloader = this; //vital
         }
+
+        public void Dispose()
+        {
+            _nativeFileDownloaderProxy?.Dispose();
+
+            GC.SuppressFinalize(this);
+        }
 
         public string LastFatalErrorMessage => _nativeFileDownloaderProxy?.LastFatalErrorMessage;
 

Laerdal.McuMgr/Shared/FileUploader/Contracts/IFileUploader.cs

@@ -1,11 +1,18 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable EventNeverSubscribedTo.Global
 
+using System;
+
 namespace Laerdal.McuMgr.FileUploader.Contracts
 {
     /// <summary>Uploads a file on a specific Nordic-chip-based BLE device</summary>
     /// <remarks>For the file-uploading process to even commence you need to be authenticated with the AED device that's being targeted.</remarks>
-    public interface IFileUploader : IFileUploaderCommandable, IFileUploaderQueryable, IFileUploaderEventSubscribable
+    public interface IFileUploader :
+        IFileUploaderCommandable,
+        IFileUploaderQueryable,
+        IFileUploaderEventSubscribable,
+        IFileUploaderCleanupable,
+        IDisposable
     {
     }
 }

Laerdal.McuMgr/Shared/FileUploader/Contracts/IFileUploaderCleanupable.cs

@@ -0,0 +1,7 @@
+namespace Laerdal.McuMgr.FileUploader.Contracts
+{
+    public interface IFileUploaderCleanupable
+    {
+        void CleanupResourcesOfLastUpload();
+    }
+}

Laerdal.McuMgr/Shared/FileUploader/Contracts/Native/INativeFileUploaderCleanupProxy.cs

@@ -0,0 +1,7 @@
+namespace Laerdal.McuMgr.FileUploader.Contracts.Native
+{
+    internal interface INativeFileUploaderCleanupProxy
+    {
+        void CleanupResourcesOfLastUpload();
+    }
+}

Laerdal.McuMgr/Shared/FileUploader/Contracts/Native/INativeFileUploaderProxy.cs

@@ -1,6 +1,13 @@
-namespace Laerdal.McuMgr.FileUploader.Contracts.Native
+using System;
+
+namespace Laerdal.McuMgr.FileUploader.Contracts.Native
 {
-    internal interface INativeFileUploaderProxy : INativeFileUploaderQueryableProxy, INativeFileUploaderCommandableProxy, INativeFileUploaderCallbacksProxy
+    internal interface INativeFileUploaderProxy :
+        INativeFileUploaderQueryableProxy,
+        INativeFileUploaderCommandableProxy,
+        INativeFileUploaderCallbacksProxy,
+        INativeFileUploaderCleanupProxy,
+        IDisposable
     {
     }
 }

Laerdal.McuMgr/Shared/FileUploader/FileUploader.cs

@@ -31,6 +31,13 @@ internal FileUploader(INativeFileUploaderProxy nativeFileUploaderProxy)
             _nativeFileUploaderProxy.FileUploader = this; //vital
         }
 
+        public void Dispose()
+        {
+            _nativeFileUploaderProxy?.Dispose();
+
+            GC.SuppressFinalize(this);
+        }
+
         public bool TrySetContext(object context) => _nativeFileUploaderProxy?.TrySetContext(context) ?? false;
         public bool TrySetBluetoothDevice(object bluetoothDevice) => _nativeFileUploaderProxy?.TrySetContext(bluetoothDevice) ?? false;
         public bool TryInvalidateCachedTransport() => _nativeFileUploaderProxy?.TryInvalidateCachedTransport() ?? false;
@@ -49,6 +56,7 @@ public EFileUploaderVerdict BeginUpload(string remoteFilePath, byte[] data)
 
         public void Cancel() => _nativeFileUploaderProxy?.Cancel();
         public void Disconnect() => _nativeFileUploaderProxy?.Disconnect();
+        public void CleanupResourcesOfLastUpload() => _nativeFileUploaderProxy?.CleanupResourcesOfLastUpload();
 
         private event EventHandler<CancelledEventArgs> _cancelled;
         private event EventHandler<LogEmittedEventArgs> _logEmitted;
@@ -265,6 +273,8 @@ ex is not ArgumentException //10 wops probably missing native lib symbols!
                     Cancelled -= UploadAsyncOnCancelled;
                     StateChanged -= UploadAsyncOnStateChanged;
                     FatalErrorOccurred -= UploadAsyncOnFatalErrorOccurred;
+
+                    CleanupResourcesOfLastUpload(); //vital
                 }
 
                 void UploadAsyncOnCancelled(object sender, CancelledEventArgs ea)

Laerdal.McuMgr/Shared/FirmwareInstaller/Contracts/IFirmwareInstaller.cs

@@ -1,10 +1,16 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable EventNeverSubscribedTo.Global
 
+using System;
+
 namespace Laerdal.McuMgr.FirmwareInstaller.Contracts
 {
     /// <summary>Upgrades the firmware on a specific Nordic-chip-based BLE device</summary>
-    public interface IFirmwareInstaller : IFirmwareInstallerQueryable, IFirmwareInstallerEventSubscribable, IFirmwareInstallerCommandable
+    public interface IFirmwareInstaller :
+        IFirmwareInstallerQueryable,
+        IFirmwareInstallerEventSubscribable,
+        IFirmwareInstallerCommandable,
+        IDisposable
     {
     }
 }

Laerdal.McuMgr/Shared/FirmwareInstaller/Contracts/Native/INativeFirmwareInstallerCleanupableProxy.cs

@@ -0,0 +1,7 @@
+namespace Laerdal.McuMgr.FirmwareInstaller.Contracts.Native
+{
+    internal interface INativeFirmwareInstallerCleanupableProxy
+    {
+        void CleanupResourcesOfLastInstallation();
+    }
+}

Laerdal.McuMgr/Shared/FirmwareInstaller/Contracts/Native/INativeFirmwareInstallerProxy.cs

@@ -1,6 +1,13 @@
+using System;
+
 namespace Laerdal.McuMgr.FirmwareInstaller.Contracts.Native
 {
-    internal interface INativeFirmwareInstallerProxy : INativeFirmwareInstallerCommandableProxy, INativeFirmwareInstallerQueryableProxy, INativeFirmwareInstallerCallbacksProxy
+    internal interface INativeFirmwareInstallerProxy :
+        INativeFirmwareInstallerCommandableProxy,
+        INativeFirmwareInstallerQueryableProxy,
+        INativeFirmwareInstallerCleanupableProxy,
+        INativeFirmwareInstallerCallbacksProxy,
+        IDisposable
     {
         string Nickname { get; set; }
     }