fix: crashes (#4281)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

app/src/main/AndroidManifest.xml

@@ -108,6 +108,10 @@
         android:localeConfig="@xml/locales_config"
         android:networkSecurityConfig="@xml/network_security_config">
 
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
+
         <!-- Default crash collection and analytics off until we (possibly) turn it on in application.onCreate -->
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"

app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt

@@ -55,7 +55,7 @@ constructor(
     private var backoffDelay = MIN_BACKOFF_MILLIS
 
     private var socket: Socket? = null
-    private lateinit var outStream: OutputStream
+    private var outStream: OutputStream? = null
 
     private var connectionStartTime: Long = 0
     private var packetsReceived: Int = 0
@@ -69,15 +69,32 @@ constructor(
     }
 
     override fun sendBytes(p: ByteArray) {
+        val stream = outStream
+        if (stream == null) {
+            Logger.w { "[$address] TCP cannot send ${p.size} bytes: outStream is null (connection not established)" }
+            return
+        }
+
         packetsSent++
         bytesSent += p.size
         Logger.d { "[$address] TCP sending packet #$packetsSent - ${p.size} bytes (Total TX: $bytesSent bytes)" }
-        outStream.write(p)
+        try {
+            stream.write(p)
+        } catch (ex: IOException) {
+            Logger.e(ex) { "[$address] TCP write error: ${ex.message}" }
+            onDeviceDisconnect(false)
+        }
     }
 
     override fun flushBytes() {
+        val stream = outStream ?: return
         Logger.d { "[$address] TCP flushing output stream" }
-        outStream.flush()
+        try {
+            stream.flush()
+        } catch (ex: IOException) {
+            Logger.e(ex) { "[$address] TCP flush error: ${ex.message}" }
+            onDeviceDisconnect(false)
+        }
     }
 
     override fun onDeviceDisconnect(waitForStopped: Boolean) {
@@ -98,6 +115,7 @@ constructor(
             }
             s.close()
             socket = null
+            outStream = null
         }
         super.onDeviceDisconnect(waitForStopped)
     }

app/src/main/res/raw/keep.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@raw/aboutlibraries" />

app/src/test/java/com/geeksville/mesh/repository/radio/TCPInterfaceTest.kt

@@ -55,6 +55,27 @@ class TCPInterfaceTest {
         assertArrayEquals("Heartbeat bytes should match", expectedHeartbeat, tcpInterface.capturedBytes)
     }
 
-    // Since startConnect is private, we'd normally need reflection or to make a internal method.
-    // For now, testing keepAlive is a good first step for stability.
+    @Test
+    fun `sendBytes does not crash when outStream is null`() = runTest {
+        val address = "192.168.1.1:4403"
+        val tcpInterface =
+            object : TCPInterface(service, dispatchers, address) {
+                override fun connect() {}
+            }
+
+        // This should not throw UninitializedPropertyAccessException
+        tcpInterface.sendBytes(byteArrayOf(1, 2, 3))
+    }
+
+    @Test
+    fun `flushBytes does not crash when outStream is null`() = runTest {
+        val address = "192.168.1.1:4403"
+        val tcpInterface =
+            object : TCPInterface(service, dispatchers, address) {
+                override fun connect() {}
+            }
+
+        // This should not throw UninitializedPropertyAccessException
+        tcpInterface.flushBytes()
+    }
 }