From 03e0ea6bb49c018a1adead58393cc3fb9175faf4 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 23 Aug 2017 08:06:07 -0700 Subject: [PATCH] start echobot as backgound activity --- .../ricochet/androidod/ConnectActivity.java | 45 +++++++------------ 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/im/ricochet/androidod/ConnectActivity.java b/app/src/main/java/im/ricochet/androidod/ConnectActivity.java index e394b6a..93753c3 100644 --- a/app/src/main/java/im/ricochet/androidod/ConnectActivity.java +++ b/app/src/main/java/im/ricochet/androidod/ConnectActivity.java @@ -1,6 +1,7 @@ package im.ricochet.androidod; import android.content.SharedPreferences; +import android.os.AsyncTask; import android.os.StrictMode; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; @@ -56,36 +57,24 @@ public class ConnectActivity extends AppCompatActivity { StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); StrictMode.setThreadPolicy(policy); - Log.i(TAG, "Attempting manual java connection to tor control"); - try { - Socket socket = new Socket("127.0.0.1", 9051); - PrintWriter out = - new PrintWriter(socket.getOutputStream(), true); - BufferedReader in = - new BufferedReader( - new InputStreamReader(socket.getInputStream())); - out.write("hello"); - //String result = in.readLine(); - Log.i(TAG, "wrote"); - //in.close(); - socket.close(); - } catch (Exception e) { - Log.e(TAG, e.toString()); - Log.e(TAG, Log.getStackTraceString(e)); - } - - - Log.i(TAG, "Go Net Test..."); - try { - boolean ok = GoRicochetMobile.testNet(); - Log.i(TAG, "NetTest: " + ok); - } catch(Exception e) { - - } - Log.i(TAG, "Starting Echo Bot"); - GoRicochetMobile.echoBot(privateKey); + //GoRicochetMobile.echoBot(privateKey); + new EchoBot(privateKey).execute(); + } + + private class EchoBot extends AsyncTask { + String privateKey; + + public EchoBot(String privateKey) { + this.privateKey = privateKey; + } + + @Override + public Void doInBackground(Void... voids) { + GoRicochetMobile.echoBot(privateKey); + return null; + } } }