Stop re-initing when coming back to the app

markwinter · Jun 8, 2014 · 923d867 · 923d867
1 parent c9e814d
commit 923d867
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/app/src/main/java/im/tox/antox/activities/MainActivity.java b/app/src/main/java/im/tox/antox/activities/MainActivity.java
@@ -1,5 +1,6 @@
 package im.tox.antox.activities;
 
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -9,6 +10,7 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -32,8 +34,6 @@
 import im.tox.antox.tox.ToxDoService;
 import im.tox.antox.tox.ToxSingleton;
 import im.tox.antox.utils.Constants;
-import im.tox.antox.utils.DHTNodeDetails;
-import im.tox.antox.utils.DhtNode;
 import im.tox.antox.utils.Tuple;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
@@ -123,7 +123,8 @@ protected void onCreate(Bundle savedInstanceState) {
             }
 
             /* If the tox service isn't already running, start it */
-            if (!toxSingleton.toxStarted) {
+            if (!toxSingleton.isRunning) {
+                //new InitToxAsync(getApplicationContext()).execute();
                 toxSingleton.initTox(getApplicationContext());
             }
 
@@ -302,4 +303,17 @@ public void copyToxID(View view) {
                 .getSystemService(context.CLIPBOARD_SERVICE);
         clipboard.setText(sharedPreferences.getString("tox_id", ""));
     }
+
+    private class InitToxAsync extends AsyncTask<Void, Void, Void> {
+
+        private Context ctx;
+
+        public InitToxAsync(Context ctx) { this.ctx = ctx; }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            toxSingleton.initTox(ctx);
+            return null;
+        }
+    }
 }
diff --git a/app/src/main/java/im/tox/antox/callbacks/AntoxOnConnectionStatusCallback.java b/app/src/main/java/im/tox/antox/callbacks/AntoxOnConnectionStatusCallback.java
@@ -28,7 +28,6 @@ public AntoxOnConnectionStatusCallback(Context ctx) {
 
     @Override
     public void execute(AntoxFriend friend, boolean online) {
-        Log.d(TAG, "Connection Status Callback");
         AntoxDB db = new AntoxDB(ctx);
         db.updateUserOnline(friend.getId(), online);
         Intent update = new Intent(Constants.BROADCAST_ACTION);

diff --git a/app/src/main/java/im/tox/antox/tox/ToxDoService.java b/app/src/main/java/im/tox/antox/tox/ToxDoService.java
@@ -83,6 +83,7 @@ public void run() {
             /* Praise the sun */
             try {
                 toxSingleton.jTox.doTox();
+                toxSingleton.isRunning = true;
             } catch (ToxException e) {
                 Log.d(TAG, e.getError().toString());
                 e.printStackTrace();

diff --git a/app/src/main/java/im/tox/antox/tox/ToxSingleton.java b/app/src/main/java/im/tox/antox/tox/ToxSingleton.java
@@ -15,9 +15,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 
-import im.tox.antox.R;
 import im.tox.antox.callbacks.AntoxOnActionCallback;
 import im.tox.antox.callbacks.AntoxOnConnectionStatusCallback;
 import im.tox.antox.callbacks.AntoxOnFriendRequestCallback;
@@ -56,7 +54,6 @@ public class ToxSingleton {
     public JTox jTox;
     private AntoxFriendList antoxFriendList;
     public CallbackHandler callbackHandler;
-    public boolean toxStarted = false;
     public NotificationManager mNotificationManager;
     public ToxDataFile dataFile;
     public File qrFile;
@@ -71,6 +68,7 @@ public class ToxSingleton {
     public rx.Observable activeKeyAndIsFriendSubject;
     public Observable friendListAndRequestsSubject;
     public Observable chatActiveAndKey;
+    public boolean isRunning = false;
 
     public AntoxFriend getAntoxFriend(String key) {
         return antoxFriendList.getById(key);
@@ -346,8 +344,6 @@ public void initTox(Context ctx) {
         Intent startToxIntent = new Intent(ctx, ToxDoService.class);
         startToxIntent.setAction(Constants.START_TOX);
         ctx.startService(startToxIntent);
-
-        toxStarted = true;
     }
 
     public static ToxSingleton getInstance() {