Merge pull request #150

[MAN-431] File upload/download fixes for samsung A8
Laerdal · Oct 23, 2024 · b76d5f5 · b76d5f5
2 parents b36a412 + 6ce8fd3
commit b76d5f5
Show file tree

Hide file tree

Showing 67 changed files with 1,160 additions and 634 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -115,14 +115,13 @@ jobs:
                    &&                                                                                                                                                              \
           rm   "./dependency_tracker_private_signing_key.ppk"    "./dependency_tracker_api_key.ppk"
 
-# todo   figure out why this is failing as of Oct 2024  ->  https://github.com/EnricoMi/publish-unit-test-result-action/issues/633
-#      - name: '📡 Publish Test Results' # https://github.com/marketplace/actions/publish-test-results
-#        uses: 'EnricoMi/publish-unit-test-result-action/macos@v2'
-#        if: always()
-#        with:
-#          files: |
-#            TestResults/**/TEST-*.xml
-#            TestResults/**/TEST-*.trx
+      - name: '📡 Publish Test Results' # https://github.com/marketplace/actions/publish-test-results
+        uses: 'EnricoMi/publish-unit-test-result-action/macos@master'
+        if: always()
+        with:
+          files: |
+            TestResults/**/TEST-*.xml
+            TestResults/**/TEST-*.trx
 
       - name: '⬆️ Upload Artifacts' # to share with other workflows   https://stackoverflow.com/a/77663335/863651
         uses: 'actions/upload-artifact@v4'

diff --git a/Laerdal.McuMgr.Bindings.Android.Native/gradle.properties b/Laerdal.McuMgr.Bindings.Android.Native/gradle.properties
@@ -19,7 +19,9 @@ android.useAndroidX=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-# in macos just comment this one out
+# as long as we use gradle 7.6 we will get warnings if we try to build against android 34 or above   we suppress such warnings
+android.suppressUnsupportedCompileSdk=34
+# in macos just comment out the windows paths and keep the homebrew path
 # org.gradle.java.home=C/://Program Files//Microsoft//jdk-11.0.15.10-hotspot
 # org.gradle.java.home=C://Program Files//OpenJDK//jdk-17.0.2
 org.gradle.java.home=/opt/homebrew/opt/openjdk@17
diff --git a/...aerdal-wrapper/src/main/java/no/laerdal/mcumgr_laerdal_wrapper/AndroidDeviceResetter.java b/...aerdal-wrapper/src/main/java/no/laerdal/mcumgr_laerdal_wrapper/AndroidDeviceResetter.java
@@ -9,6 +9,7 @@
 import io.runtime.mcumgr.exception.McuMgrException;
 import io.runtime.mcumgr.managers.DefaultManager;
 import io.runtime.mcumgr.response.dflt.McuMgrOsResponse;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings("unused")
@@ -65,7 +66,7 @@ public void onError(@NotNull final McuMgrException error) {
         });
     }
 
-    public void disconnect() { //noinspection ConstantValue
+    public void disconnect() {
         if (_manager == null)
             return;
 
@@ -95,18 +96,21 @@ protected void onCleared() {
 
     private String _lastFatalErrorMessage;
 
+    @Contract(pure = true)
     public String getLastFatalErrorMessage() {
         return _lastFatalErrorMessage;
     }
 
     public void fatalErrorOccurredAdvertisement(final String errorMessage) {
-        _lastFatalErrorMessage = errorMessage; //this method is intentionally empty   its meant to be overridden by csharp binding libraries to intercept updates
+        _lastFatalErrorMessage = errorMessage;
     }
 
+    @Contract(pure = true)
     public void logMessageAdvertisement(final String message, final String category, final String level) {
         //this method is intentionally empty   its meant to be overridden by csharp binding libraries to intercept updates
     }
 
+    @Contract(pure = true)
     public void stateChangedAdvertisement(final EAndroidDeviceResetterState oldState, final EAndroidDeviceResetterState currentState) {
         //this method is intentionally empty   its meant to be overridden by csharp binding libraries to intercept updates
     }