From f8dee330d3899153599b8a8b43f283e89c133cc6 Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Sun, 11 Sep 2011 21:22:19 +0200 Subject: [PATCH] tcp: use new backend "api" --- src/backend/TcpUploader.scala | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/backend/TcpUploader.scala b/src/backend/TcpUploader.scala index bbf22aa..96b537f 100644 --- a/src/backend/TcpUploader.scala +++ b/src/backend/TcpUploader.scala @@ -11,6 +11,7 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUpl val TAG = "APRSdroid.TcpUploader" val hostname = prefs.getString("tcp.server", "euro.aprs2.net") val so_timeout = prefs.getStringInt("tcp.sotimeout", 120) + val RECONNECT = 30 var conn : TcpSocketThread = null createConnection() @@ -58,6 +59,8 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUpl def init_socket() { Log.d(TAG, "init_socket()") + service.postAddPost(StorageDatabase.Post.TYPE_INFO, R.string.post_info, + service.getString(R.string.post_connecting, host, port.asInstanceOf[AnyRef])) this.synchronized { socket = new Socket(host, port) socket.setKeepAlive(true) @@ -74,6 +77,7 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUpl } override def run() { + import StorageDatabase.Post._ var need_reconnect = false Log.d(TAG, "TcpSocketThread.run()") try { @@ -94,11 +98,15 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUpl Log.d(TAG, "recv: " + line) if (line(0) != '#') service.postSubmit(line) + else + service.postAddPost(TYPE_INFO, R.string.post_info, line) } if (running && (line == null || !socket.isConnected())) { Log.d(TAG, "reconnecting in 30s") + service.postAddPost(TYPE_INFO, R.string.post_info, + service.getString(R.string.post_reconnect, RECONNECT.asInstanceOf[AnyRef])) shutdown() - Thread.sleep(30*1000) + Thread.sleep(RECONNECT*1000) init_socket() } } catch {