KISS FEND Fix

Fixes the newline for fend and following data.

src/tncproto/KissProto.scala

@@ -82,10 +82,8 @@ class KissProto(service : AprsService, is : InputStream, os : OutputStream) exte
 
 	def writePacket(p : APRSPacket) {
 		Log.d(TAG, "writePacket: " + p)
-		os.write(Kiss.FEND)
-		os.write(Kiss.CMD_DATA)
-		os.write(p.toAX25Frame())
-		os.write(Kiss.FEND)
+		val combinedData = Array[Byte](Kiss.FEND.toByte, Kiss.CMD_DATA.toByte) ++ p.toAX25Frame() ++ Array[Byte](Kiss.FEND.toByte)
+		os.write(combinedData)
 		os.flush()
 	}
 }

src/tncproto/KissProto.scala.bak

@@ -0,0 +1,91 @@
+package org.aprsdroid.app
+
+import _root_.android.util.Log
+import _root_.java.io.{InputStream, OutputStream}
+
+import _root_.net.ab0oo.aprs.parser._
+
+class KissProto(service : AprsService, is : InputStream, os : OutputStream) extends TncProto(is, os) {
+	val TAG = "APRSdroid.KissProto"
+
+	object Kiss {
+		// escape sequences
+		val FEND  = 0xC0
+		val FESC  = 0xDB
+		val TFEND = 0xDC
+		val TFESC = 0xDD
+
+		// commands
+		val CMD_DATA = 0x00
+	}
+
+	val initstring = java.net.URLDecoder.decode(service.prefs.getString("kiss.init", ""), "UTF-8")
+	val initdelay = service.prefs.getStringInt("kiss.delay", 300)
+	if (initstring != null && initstring != "") {
+		for (line <- initstring.split("\n")) {
+			service.postAddPost(StorageDatabase.Post.TYPE_TX,
+				R.string.p_tnc_init, line)
+			os.write(line.getBytes())
+			os.write('\r')
+			os.write('\n')
+			Thread.sleep(initdelay)
+		}
+	}
+
+	if (service.prefs.getCallsign().length() > 6) {
+		throw new IllegalArgumentException(service.getString(R.string.e_toolong_callsign))
+	}
+
+	def readPacket() : String = {
+		import Kiss._
+		val buf = scala.collection.mutable.ListBuffer[Byte]()
+		do {
+			var ch = is.read()
+			if (ch >= 0)
+				Log.d(TAG, "readPacket: %02X '%c'".format(ch, ch))
+			ch match {
+			case FEND =>
+				if (buf.length > 0) {
+					Log.d(TAG, "readPacket: sending back %s".format(new String(buf.toArray)))
+					try {
+						return Parser.parseAX25(buf.toArray).toString().trim()
+					} catch {
+						case e : Exception => buf.clear()
+					}
+				}
+			case FESC => is.read() match {
+				case TFEND => buf.append(FEND.toByte)
+				case TFESC => buf.append(FESC.toByte)
+				case _ =>
+				}
+			case -1	=> throw new java.io.IOException("KissReader out of data")
+			case 0 =>
+				// hack: ignore 0x00 byte at start of frame, this is the command
+				if (buf.length != 0)
+					buf.append(ch.toByte)
+				else
+					Log.d(TAG, "readPacket: ignoring command byte")
+			case 10 =>
+				// heuristic for ASCII strings:
+				//   * non-empty (including CRLF)
+				//   * starts with ASCII character (KISS starts with >=0x82)
+				//     (buf(0) > 0) does this check, as byte is [-128..127]
+				//   * ends in CRLF
+				if (buf.length > 1 && (buf(0) > 0) && buf(buf.length-1)==13)
+					return new String(buf.toArray).trim()
+			case _ =>
+				buf.append(ch.toByte)
+			}
+		} while (true)
+		""
+	}
+
+	def writePacket(p : APRSPacket) {
+		Log.d(TAG, "writePacket: " + p)
+		os.write(Kiss.FEND)
+		os.write(Kiss.CMD_DATA)
+		os.write(p.toAX25Frame())
+		os.write(Kiss.FEND)
+		os.flush()
+	}
+}