refa (AndroidFileUploader.java): onError() now returns generic error …

…codes '-1' (old was: returning '0' as error codes which stood for 'ok' thus looking weird in the logs)
Laerdal · Oct 18, 2024 · 447f2c7 · 447f2c7
1 parent b2b5fd8
commit 447f2c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...-laerdal-wrapper/src/main/java/no/laerdal/mcumgr_laerdal_wrapper/AndroidFileUploader.java b/...-laerdal-wrapper/src/main/java/no/laerdal/mcumgr_laerdal_wrapper/AndroidFileUploader.java
@@ -401,7 +401,7 @@ public void onError(
     {
         if (!(exception instanceof McuMgrErrorException))
         {
-            fatalErrorOccurredAdvertisement(remoteFilePath, errorMessage, 0, 0);
+            fatalErrorOccurredAdvertisement(remoteFilePath, errorMessage, -1, -1);
             return;
         }
 

diff --git a/Laerdal.McuMgr/Droid/FileUploader/FileUploader.cs b/Laerdal.McuMgr/Droid/FileUploader/FileUploader.cs
@@ -91,12 +91,12 @@ private void CleanupInfrastructure()
                     // ignored
                 }
             }
-            
+
             public void CleanupResourcesOfLastUpload()
             {
                 //nothing to do in android
             }
-            
+
             #region commands
 
             public EFileUploaderVerdict BeginUpload(
@@ -138,7 +138,7 @@ public bool TrySetBluetoothDevice(object bluetoothDevice)
             }
 
             #endregion commands
-            
+
 
 
             #region android callbacks -> csharp event emitters
@@ -149,7 +149,7 @@ public override void FatalErrorOccurredAdvertisement(string resource, string err
 
                 FatalErrorOccurredAdvertisement(resource, errorMessage, (EMcuMgrErrorCode) mcuMgrErrorCode, (EFileUploaderGroupReturnCode) fileUploaderGroupReturnCode);
             }
-            
+
             public void FatalErrorOccurredAdvertisement(string resource, string errorMessage, EMcuMgrErrorCode mcuMgrErrorCode, EFileUploaderGroupReturnCode fileUploaderGroupReturnCode)
             {
                 _fileUploaderCallbacksProxy?.FatalErrorOccurredAdvertisement(
-Original file line number
+Diff line change
@@ Expand Up / @@ -401,7 +401,7 @@ public void onError( @@
         {
             if (!(exception instanceof McuMgrErrorException))
             {
-                fatalErrorOccurredAdvertisement(remoteFilePath, errorMessage, 0, 0);
+                fatalErrorOccurredAdvertisement(remoteFilePath, errorMessage, -1, -1);
                 return;
             }
@@ Expand Down @@