From b6310ab26328dbfd04b7a84d606c1046a02c484e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 2 Jul 2014 01:39:50 +0000
Subject: [PATCH] Move app initialization out of EmailListActivity so it can be
 used elsewhere

---
 .../i2p/bote/android/EmailListActivity.java   | 19 -------------
 .../java/i2p/bote/android/InitActivities.java | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/i2p/bote/android/InitActivities.java

diff --git a/app/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
index 11352af..7febf0b 100644
--- a/app/src/main/java/i2p/bote/android/EmailListActivity.java
+++ b/app/src/main/java/i2p/bote/android/EmailListActivity.java
@@ -28,7 +28,6 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import net.i2p.android.router.service.IRouterState;
 
@@ -413,24 +412,6 @@ public class EmailListActivity extends ActionBarActivity implements
         mDrawerToggle.onConfigurationChanged(newConfig);
     }
 
-    private class InitActivities {
-        private final Context ctx;
-        private final String myDir;
-
-        public InitActivities(Context c) {
-            ctx = c;
-            // This needs to be changed so that we can have an alternative place
-            myDir = c.getFilesDir().getAbsolutePath();
-        }
-
-        void initialize() {
-            // Set up the locations so settings can find them
-            System.setProperty("i2p.dir.base", myDir);
-            System.setProperty("i2p.dir.config", myDir);
-            System.setProperty("wrapper.logfile", myDir + "/wrapper.log");
-        }
-    }
-
     // FolderFragment.OnEmailSelectedListener
 
     @Override
diff --git a/app/src/main/java/i2p/bote/android/InitActivities.java b/app/src/main/java/i2p/bote/android/InitActivities.java
new file mode 100644
index 0000000..b61e438
--- /dev/null
+++ b/app/src/main/java/i2p/bote/android/InitActivities.java
@@ -0,0 +1,27 @@
+package i2p.bote.android;
+
+import android.content.Context;
+
+class InitActivities {
+    private final Context ctx;
+    private final String myDir;
+
+    public InitActivities(Context c) {
+        ctx = c;
+        // This needs to be changed so that we can have an alternative place
+        myDir = c.getFilesDir().getAbsolutePath();
+    }
+
+    void initialize() {
+        // Don't initialize twice
+        if (System.getProperty("i2pbote.initialized", "false").equals("true"))
+            return;
+
+        // Set up the locations so settings can find them
+        System.setProperty("i2p.dir.base", myDir);
+        System.setProperty("i2p.dir.config", myDir);
+        System.setProperty("wrapper.logfile", myDir + "/wrapper.log");
+
+        System.setProperty("i2pbote.initialized", "true");
+    }
+}