From bafe1db4a047db8a7b2afc17aa8302ece913987d Mon Sep 17 00:00:00 2001
From: Omer Schloss <schlossomer@gmail.com>
Date: Tue, 22 Jun 2021 20:30:02 +0300
Subject: [PATCH] alert string update fix

---
 .../example/flightgearcontrollerapp/model/TelnetClient.kt    | 5 ++++-
 app/src/main/res/values/strings.xml                          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/flightgearcontrollerapp/model/TelnetClient.kt b/app/src/main/java/com/example/flightgearcontrollerapp/model/TelnetClient.kt
index 92f3d83..8484385 100644
--- a/app/src/main/java/com/example/flightgearcontrollerapp/model/TelnetClient.kt
+++ b/app/src/main/java/com/example/flightgearcontrollerapp/model/TelnetClient.kt
@@ -1,6 +1,7 @@
 package com.example.flightgearcontrollerapp.model
 
 import java.io.PrintWriter
+import java.net.InetSocketAddress
 import java.net.Socket
 
 class TelnetClient{
@@ -9,11 +10,13 @@ class TelnetClient{
     private lateinit var output:PrintWriter
     fun connect(ipAddress: String, portAddress: Int): Boolean {
         return try {
-            client = Socket(ipAddress, portAddress)
+            client = Socket()
+            client.connect(InetSocketAddress(ipAddress, portAddress),5000)
             output = PrintWriter(client.getOutputStream(), true)
             true
         }catch (e: Exception){
             e.printStackTrace()
+            throw RuntimeException(e)
             false
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b143b1c..8b954f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="txt_rudder">Rudder</string>
     <string name="disconnect">disconnect</string>
     <string name="alert_dialog_flightgear_connection">FlightGear Connection</string>
-    <string name="alert_instruction">For connecting to FlightGear App,\nFirst open the app.\nThen, copy these lines to Setting-> Additional Setting:\n\n &#45;&#45;telnet=socket,in,10,\'ip\',\'port\',tcp,playback_small \n\n and now just press fly!</string>
+    <string name="alert_instruction">For connecting to FlightGear App,\nFirst open the app.\nThen, copy these lines to Setting-> Additional Setting:\n\n &#45;&#45;telnet=socket,in,10,\'ip\',\'port\',tcp\n\n and now just press fly!</string>
     <string name="ok_btn">continue</string>
     <string name="alert_title">FlightGear Connection</string>
     <string name="connection_failed">Connection failed!</string>