TNC init string now URL-encoded, fix #121

res/values/strings.xml

@@ -332,7 +332,8 @@
 <string name="p_bt_channel_entry">Enter channel (most often: "1"; empty for SPP)</string>
 
 <string name="p_bt_tnc_init">TNC init string</string>
-<string name="p_bt_tnc_init_summary">Initialization commands for TNC</string>
+<string name="p_bt_tnc_init_summary">Initialization commands for TNC (URL-encoded, Esc=%%1B, "%%"=%%25)</string>
+<string name="p_bt_tnc_init_msg" formatted="false">URL-encoded string (Esc=%1B, \"%\"=%25), delay after each line:</string>
 
 <string name="p_bt_tnc_delay">TNC init delay</string>
 <string name="p_bt_tnc_delay_summary">Time to wait after each line</string>

res/xml/backend_bluetooth.xml

@@ -30,6 +30,7 @@
 		android:singleLine="false"
 		android:title="@string/p_bt_tnc_init"
 		android:summary="@string/p_bt_tnc_init_summary"
+		android:dialogMessage="@string/p_bt_tnc_init_msg"
 		android:dialogTitle="@string/p_bt_tnc_init" />
         <de.duenndns.EditTextPreferenceWithValue
                 android:key="bt.delay"

res/xml/backend_usb.xml

@@ -20,6 +20,7 @@
 		android:singleLine="false"
 		android:title="@string/p_bt_tnc_init"
 		android:summary="@string/p_bt_tnc_init_summary"
+		android:dialogMessage="@string/p_bt_tnc_init_msg"
 		android:dialogTitle="@string/p_bt_tnc_init" />
         <de.duenndns.EditTextPreferenceWithValue
                 android:key="usb.delay"

src/backend/BluetoothTnc.scala

@@ -106,7 +106,7 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack
 			this.synchronized {
 				proto = createTncProto(socket.getInputStream(), socket.getOutputStream())
 			}
-			val initstring = prefs.getString("bt.init", null)
+			val initstring = java.net.URLDecoder.decode(prefs.getString("bt.init", ""), "UTF-8")
 			val initdelay = prefs.getStringInt("bt.delay", 300)
 			if (initstring != null && initstring != "") {
 				log("Sending init: " + initstring)

src/backend/UsbTnc.scala

@@ -145,7 +145,7 @@ class UsbTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBackend(pr
 
 			log("Opened " + ser.getClass().getSimpleName() + " at " + baudrate + "bd")
 			val os = new SerialOutputStream(ser)
-			val initstring = prefs.getString("usb.init", null)
+			val initstring = java.net.URLDecoder.decode(prefs.getString("usb.init", ""), "UTF-8")
 			val initdelay = prefs.getStringInt("usb.delay", 300)
 			if (initstring != null && initstring != "") {
 				log("Sending init: " + initstring)