Merge branch 'feature/66_read_image_list' into develop

Author: Nick Kibysh

android/src/main/kotlin/no/nordicsemi/android/mcumgr_flutter/McumgrFlutterPlugin.kt

@@ -4,13 +4,18 @@ import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import android.util.Pair
 import androidx.annotation.NonNull
+import com.google.protobuf.kotlin.toByteString
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.EventChannel
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
+import io.runtime.mcumgr.McuMgrCallback
 import io.runtime.mcumgr.dfu.FirmwareUpgradeManager
+import io.runtime.mcumgr.exception.McuMgrException
+import io.runtime.mcumgr.response.img.McuMgrImageStateResponse
+import no.nordicsemi.android.mcumgr_flutter.ext.toProto
 
 import no.nordicsemi.android.mcumgr_flutter.logging.LoggableMcuMgrBleTransport
 import no.nordicsemi.android.mcumgr_flutter.utils.*
@@ -67,45 +72,59 @@ class McumgrFlutterPlugin : FlutterPlugin, MethodCallHandler {
 					initializeUpdateManager(call)
 					result.success(null)
 				}
+
 				FlutterMethod.update -> {
 					update(call)
 					result.success(null)
 				}
+
 				FlutterMethod.updateSingleImage -> {
 					updateSingleImage(call)
 					result.success(null)
 				}
+
 				FlutterMethod.pause -> {
 					retrieveManager(call).pause()
 					result.success(null)
 				}
+
 				FlutterMethod.resume -> {
 					retrieveManager(call).resume()
 					result.success(null)
 				}
+
 				FlutterMethod.cancel -> {
 					retrieveManager(call).cancel()
 					result.success(null)
 				}
+
 				FlutterMethod.isPaused -> {
 					val isPaused = retrieveManager(call).isPaused
 					result.success(isPaused)
 				}
+
 				FlutterMethod.isInProgress -> {
 					val isPaused = retrieveManager(call).isInProgress
 					result.success(isPaused)
 				}
+
 				FlutterMethod.readLogs -> {
 					result.success(readLogs(call))
 				}
+
 				FlutterMethod.clearLogs -> {
 					retrieveManager(call).clearLogs()
 					result.success(null)
 				}
+
 				FlutterMethod.kill -> {
 					kill(call)
 					result.success(null)
 				}
+
+				FlutterMethod.readImageList -> {
+					imageList(call, result)
+				}
 			}
 		} catch (e: FlutterError) {
 			result.error(e.code, e.message, null)
@@ -162,7 +181,8 @@ class McumgrFlutterPlugin : FlutterPlugin, MethodCallHandler {
 			)
 		}
 
-		updateManager.start(arg.images.map { Pair.create(it.key, it.value_.toByteArray()) }, config)
+		val images = arg.images.map { Pair.create(it.image, it.data_.toByteArray()) }
+		updateManager.start(images, config)
 	}
 
 	@Throws(FlutterError::class)
@@ -235,4 +255,40 @@ class McumgrFlutterPlugin : FlutterPlugin, MethodCallHandler {
 		}
 		managers.remove(address)
 	}
+
+	/** Image Manager */
+	private fun imageList(@NonNull call: MethodCall, result: Result) {
+		val address = (call.arguments as? String).guard {
+			throw WrongArguments("Device address expected")
+		}
+		val updateManager = managers[address].guard {
+			throw UpdateManagerDoesNotExist("Update manager does not exist")
+		}
+
+		val callback = object : McuMgrCallback<McuMgrImageStateResponse> {
+			override fun onResponse(response: McuMgrImageStateResponse) {
+				var protoResponse: ProtoListImagesResponse
+				if (response.images != null) {
+					val images = response.images.map { it.toProto() }
+					protoResponse = ProtoListImagesResponse(
+						uuid = address,
+						images = images,
+						existing = true
+					)
+				} else {
+					protoResponse = ProtoListImagesResponse(
+						uuid = address,
+						existing = false
+					)
+				}
+				result.success(protoResponse.encode())
+			}
+
+			override fun onError(exception: McuMgrException) {
+				result.error("mcumgr_error", exception.message, null)
+			}
+		}
+
+		updateManager.imageManager.list(callback)
+	}
 }

android/src/main/kotlin/no/nordicsemi/android/mcumgr_flutter/UpdateManager.kt

@@ -2,12 +2,15 @@ package no.nordicsemi.android.mcumgr_flutter
 
 import android.util.Log
 import android.util.Pair
+import io.runtime.mcumgr.McuMgrCallback
 import io.runtime.mcumgr.ble.McuMgrBleTransport
 import io.runtime.mcumgr.dfu.model.McuMgrImageSet;
 import io.runtime.mcumgr.dfu.FirmwareUpgradeCallback
 import io.runtime.mcumgr.dfu.FirmwareUpgradeController
 import io.runtime.mcumgr.dfu.FirmwareUpgradeManager
 import io.runtime.mcumgr.exception.McuMgrException
+import io.runtime.mcumgr.managers.ImageManager
+import io.runtime.mcumgr.response.img.McuMgrImageStateResponse
 import no.nordicsemi.android.mcumgr_flutter.ext.shouldLog
 import no.nordicsemi.android.mcumgr_flutter.ext.toProto
 import no.nordicsemi.android.mcumgr_flutter.gen.*
@@ -43,6 +46,7 @@ class UpdateManager(
 	private val manager: FirmwareUpgradeManager = FirmwareUpgradeManager(transport, this)
 	private val address: String = transport.bluetoothDevice.address
 	private val transport: LoggableMcuMgrBleTransport = transport as LoggableMcuMgrBleTransport
+	val imageManager: ImageManager = ImageManager(transport)
 
 	init {
 		manager.setMemoryAlignment(4)

android/src/main/kotlin/no/nordicsemi/android/mcumgr_flutter/ext/ImageSlot.kt

@@ -0,0 +1,20 @@
+package no.nordicsemi.android.mcumgr_flutter.ext
+
+import io.runtime.mcumgr.response.McuMgrResponse
+import io.runtime.mcumgr.response.img.McuMgrImageStateResponse
+import no.nordicsemi.android.mcumgr_flutter.gen.ProtoImageSlot
+import okio.ByteString
+import okio.ByteString.Companion.toByteString
+
+fun McuMgrImageStateResponse.ImageSlot.toProto(): ProtoImageSlot {
+    return ProtoImageSlot(
+        slot = this.slot.toLong(),
+        version = version,
+        hash = hash.toByteString(),
+        bootable = bootable,
+        pending = pending,
+        confirmed = confirmed,
+        active = active,
+        permanent = permanent
+    )
+}

android/src/main/kotlin/no/nordicsemi/android/mcumgr_flutter/utils/FlutterMethod.kt

@@ -15,7 +15,8 @@ enum class FlutterMethod {
 	cancel,
 	readLogs,
 	clearLogs,
-	kill;
+	kill,
+	readImageList;
 
 	companion object {
 		fun valueOfOrNull(string: String) = try {

example/ios/Podfile.lock

@@ -39,18 +39,18 @@ PODS:
     - ZIPFoundation (= 0.9.13)
   - flutter_blue_plus (0.0.1):
     - Flutter
-  - iOSMcuManagerLibrary (1.4.3):
+  - iOSMcuManagerLibrary (1.6):
     - SwiftCBOR (= 0.4.4)
   - mcumgr_flutter (0.0.2):
     - Flutter
-    - iOSMcuManagerLibrary (= 1.4.3)
+    - iOSMcuManagerLibrary (= 1.6)
     - SwiftProtobuf
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - SDWebImage (5.18.10):
-    - SDWebImage/Core (= 5.18.10)
-  - SDWebImage/Core (5.18.10)
+  - SDWebImage (5.19.0):
+    - SDWebImage/Core (= 5.19.0)
+  - SDWebImage/Core (5.19.0)
   - SwiftCBOR (0.4.4)
   - SwiftProtobuf (1.25.2)
   - SwiftyGif (5.4.4)
@@ -96,10 +96,10 @@ SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_archive: 1805fdd3a695fd284b43edb53dc35ca843fb761c
   flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96
-  iOSMcuManagerLibrary: 6c2ff04a23bd9dbfddce95374638fe28c32f406c
-  mcumgr_flutter: e4703f2e33405ba3fef314b8c9a93563843a1520
+  iOSMcuManagerLibrary: 4102a4595be1c69e5286d7f1520a733c82c30b0a
+  mcumgr_flutter: 097e59bec5917b527ba6d095da57bdaed2de1fa2
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec
+  SDWebImage: 981fd7e860af070920f249fd092420006014c3eb
   SwiftCBOR: ce5354ec8b660da2d6fc754462881119dbe1f963
   SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f

example/ios/Runner.xcodeproj/project.pbxproj

@@ -358,7 +358,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = P3R8YQEV4L;
+				DEVELOPMENT_TEAM = 88Z93X62R5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -374,7 +374,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = no.nordicsemi.mcumgrFlutterExample;
+				PRODUCT_BUNDLE_IDENTIFIER = no.nordicsemi.mcumgrFlutterExample2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -496,7 +496,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = P3R8YQEV4L;
+				DEVELOPMENT_TEAM = 88Z93X62R5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -512,7 +512,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = no.nordicsemi.mcumgrFlutterExample;
+				PRODUCT_BUNDLE_IDENTIFIER = no.nordicsemi.mcumgrFlutterExample2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -528,7 +528,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = P3R8YQEV4L;
+				DEVELOPMENT_TEAM = 88Z93X62R5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -544,7 +544,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = no.nordicsemi.mcumgrFlutterExample;
+				PRODUCT_BUNDLE_IDENTIFIER = no.nordicsemi.mcumgrFlutterExample2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

example/lib/src/handlers/firmware_update_handler.dart

@@ -8,7 +8,6 @@ import 'package:mcumgr_flutter_example/src/repository/firmware_image_repository.
 
 import 'package:http/http.dart' as http;
 import 'package:path_provider/path_provider.dart' as path_provider;
-import 'package:tuple/tuple.dart';
 import 'package:uuid/uuid.dart';
 
 import 'package:mcumgr_flutter/mcumgr_flutter.dart';
@@ -111,7 +110,11 @@ class FirmwareUnpacker extends FirmwareUpdateHandler {
     for (final file in manifest.files) {
       final firmwareFile = File('${destinationDir.path}/${file.file}');
       final firmwareFileData = await firmwareFile.readAsBytes();
-      firmware.firmwareImages!.add(Tuple2(file.image, firmwareFileData));
+      final image = Image(
+        image: file.image,
+        data: firmwareFileData,
+      );
+      firmware.firmwareImages!.add(image);
     }
 
     // delete tempDir
@@ -141,7 +144,7 @@ class FirmwareUpdater extends FirmwareUpdateHandler {
 
     if (request is SingleImageFirmwareUpdateRequest) {
       final fwImage = request.firmwareImage;
-      await updateManager.updateWithImageData(image: fwImage!);
+      await updateManager.updateWithImageData(imageData: fwImage!);
       return updateManager;
     } else {
       final multiImageRequest = request as MultiImageFirmwareUpdateRequest;

example/lib/src/model/firmware_update_request.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
+import 'package:mcumgr_flutter/mcumgr_flutter.dart';
 import 'package:mcumgr_flutter_example/src/model/firmware_image.dart';
-import 'package:tuple/tuple.dart';
 
 class FirmwareUpdateRequest {
   SelectedFirmware? firmware;
@@ -25,7 +25,7 @@ class SingleImageFirmwareUpdateRequest extends FirmwareUpdateRequest {
 
 class MultiImageFirmwareUpdateRequest extends FirmwareUpdateRequest {
   Uint8List? zipFile;
-  List<Tuple2<int, Uint8List>>? firmwareImages;
+  List<Image>? firmwareImages;
 
   RemoteFirmware? get remoteFirmware => firmware as RemoteFirmware?;
 

example/pubspec.lock

@@ -382,7 +382,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.2.0+1"
+    version: "0.3.3"
   meta:
     dependency: transitive
     description:

ios/Classes/Extensions/Image+Proto.swift

@@ -0,0 +1,32 @@
+//
+//  Image+Proto.swift
+//  mcumgr_flutter
+//
+//  Created by Nick Kibysh on 18/03/2024.
+//
+
+import Foundation
+import iOSMcuManagerLibrary
+
+extension ImageManager.Image {
+    init(proto: ProtoImage) {
+        let image = Int(proto.image)
+        let slot = Int(proto.slot)
+        let data = proto.data
+        
+        let hash: Data
+        if proto.hasHash {
+            hash = proto.hash
+        } else {
+            hash = try! McuMgrImage(data: data).hash
+        }
+        
+        
+        if proto.hasSlot {
+            self.init(image: image, slot: slot, hash: hash, data: data)
+        } else {
+            self.init(image: image, hash: hash, data: data)
+        }
+        
+    }
+}