From e6d6efe495561b596d45814c711fc78b7ad0cd22 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sat, 25 Mar 2023 22:14:39 -0700
Subject: [PATCH] Additional RTTTL config

---
 Meshtastic/Helpers/BLEManager.swift                       | 6 +++---
 Meshtastic/Helpers/MeshPackets.swift                      | 3 +++
 Meshtastic/Persistence/UpdateCoreData.swift               | 6 +++---
 Meshtastic/Views/Settings/Config/Module/RtttlConfig.swift | 6 ++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index 5347d8b0..40d69a25 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -1344,10 +1344,10 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 		return 0
 	}
 	
-	public func saveRtttlConfig(config: RTTTLConfig, fromUser: UserEntity, toUser: UserEntity, adminIndex: Int32) -> Int64 {
+	public func saveRtttlConfig(ringtone: String, fromUser: UserEntity, toUser: UserEntity, adminIndex: Int32) -> Int64 {
 
 		var adminPacket = AdminMessage()
-		adminPacket.setRingtoneMessage = config.ringtone
+		adminPacket.setRingtoneMessage = ringtone
 
 		var meshPacket: MeshPacket = MeshPacket()
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
@@ -1364,7 +1364,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 		let messageDescription = "Saved RTTTL Ringtone Config for \(toUser.longName ?? NSLocalizedString("unknown", comment: "Unknown"))"
 
 		if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) {
-			upsertRtttlConfigPacket(config: config, nodeNum: toUser.num, context: context!)
+			upsertRtttlConfigPacket(ringtone: ringtone, nodeNum: toUser.num, context: context!)
 			return Int64(meshPacket.id)
 		}
 
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index 10f468a3..597d88d8 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -487,6 +487,9 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) {
 
 			}
 
+		} else if adminMessage.payloadVariant == AdminMessage.OneOf_PayloadVariant.getRingtoneResponse(adminMessage.getRingtoneResponse) {
+			let ringtone = adminMessage.getRingtoneResponse
+			upsertRtttlConfigPacket(ringtone: ringtone, nodeNum: Int64(packet.from), context: context)
 		} else {
 			MeshLogger.log("🕸️ MESH PACKET received for Admin App \(try! packet.decoded.jsonString())")
 		}
diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift
index 40b210f1..1b8789a9 100644
--- a/Meshtastic/Persistence/UpdateCoreData.swift
+++ b/Meshtastic/Persistence/UpdateCoreData.swift
@@ -699,7 +699,7 @@ func upsertExternalNotificationModuleConfigPacket(config: Meshtastic.ModuleConfi
 	}
 }
 
-func upsertRtttlConfigPacket(config: RTTTLConfig, nodeNum: Int64, context: NSManagedObjectContext) {
+func upsertRtttlConfigPacket(ringtone: String, nodeNum: Int64, context: NSManagedObjectContext) {
 
 	let logString = String.localizedStringWithFormat(NSLocalizedString("mesh.log.rangetest.config %@", comment: "Range Test module config received: %@"), String(nodeNum))
 	MeshLogger.log("⛰️ \(logString)")
@@ -716,10 +716,10 @@ func upsertRtttlConfigPacket(config: RTTTLConfig, nodeNum: Int64, context: NSMan
 		if !fetchedNode.isEmpty {
 			if fetchedNode[0].rtttlConfig == nil {
 				let newRtttlConfig = RTTTLConfigEntity(context: context)
-				newRtttlConfig.ringtone = config.ringtone
+				newRtttlConfig.ringtone = ringtone
 				fetchedNode[0].rtttlConfig = newRtttlConfig
 			} else {
-				fetchedNode[0].rtttlConfig?.ringtone = config.ringtone
+				fetchedNode[0].rtttlConfig?.ringtone = ringtone
 			}
 			do {
 				try context.save()
diff --git a/Meshtastic/Views/Settings/Config/Module/RtttlConfig.swift b/Meshtastic/Views/Settings/Config/Module/RtttlConfig.swift
index 40fafcde..1f91c257 100644
--- a/Meshtastic/Views/Settings/Config/Module/RtttlConfig.swift
+++ b/Meshtastic/Views/Settings/Config/Module/RtttlConfig.swift
@@ -98,9 +98,7 @@ struct RtttlConfig: View {
 
 				let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
 					if connectedNode != nil {
-						var rtttl = RTTTLConfig()
-						rtttl.ringtone = ringtone
-						let adminMessageId =  bleManager.saveRtttlConfig(config: rtttl, fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
+						let adminMessageId =  bleManager.saveRtttlConfig(ringtone: ringtone, fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
 						if adminMessageId > 0 {
 							// Should show a saved successfully alert once I know that to be true
 							// for now just disable the button after a successful save
@@ -123,7 +121,7 @@ struct RtttlConfig: View {
 				setRtttLConfigValue()
 
 				// Need to request a Rtttl Config from the remote node before allowing changes
-				if bleManager.connectedPeripheral != nil && node?.rangeTestConfig == nil {
+				if bleManager.connectedPeripheral != nil && node?.rtttlConfig == nil {
 					let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
 					if node != nil && connectedNode != nil {
 						_ = bleManager.requestRtttlConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)