fixed issue with dropped empty strings between EOLs

NordicSemiconductor · Jul 28, 2021 · d4a9955 · d4a9955
1 parent 36c278f
commit d4a9955
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/nRF Toolbox/Profiles/UART/Model/UARTCommandModel.swift b/nRF Toolbox/Profiles/UART/Model/UARTCommandModel.swift
@@ -81,7 +81,7 @@ struct TextCommand: UARTCommandModel, Equatable {
         ])
     }
 
-    var title: String { text }
+    var title: String { text.split(whereSeparator: \.isNewline).joined() }
 
     var data: Data {
         text.data(using: .utf8)!

diff --git a/nRF Toolbox/Profiles/UART/NewCommand/UARTNewCommandViewController.swift b/nRF Toolbox/Profiles/UART/NewCommand/UARTNewCommandViewController.swift
@@ -116,7 +116,9 @@ class UARTNewCommandViewController: UIViewController {
         let image = CommandImage.allCases[selectedItem]
 
         if typeSegmentControl.selectedSegmentIndex == 0 {
-            let text = textView.text.split(separator: "\n").joined(separator: self.eolSymbol())
+            let slices = textView.text.split(omittingEmptySubsequences: false, whereSeparator: \.isNewline)
+            let text = slices.joined(separator: eolSymbol())
+
             command = TextCommand(text: text, image: image, eol: self.eolSymbol())
         } else {
             command = DataCommand(data: Data(valueTextField.text!.hexa), image: image)