Merge pull request #572 from hypnosis-i2p/openssl

reworked android. added a build script.

android/.gitignore

@@ -1,4 +1,7 @@
-/gen/
-/libs/
-/tests/
+gen
+tests
 .idea
+local.properties
+build.sh
+bin
+log*

android/build.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="i2pd" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Insert sdk.dir=... into './local.properties'. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <fail
+            message="ndk.dir is missing. Insert ndk.dir=... into './local.properties'."
+            unless="ndk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

android/libs/.gitignore

@@ -0,0 +1 @@
+armeabi-v7a

android/proguard-project.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

android/src/org/purplei2p/i2pd/DaemonSingleton.java

@@ -0,0 +1,124 @@
+package org.purplei2p.i2pd;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import android.util.Log;
+
+public class DaemonSingleton {
+	private static final String TAG="i2pd";
+	private static final DaemonSingleton instance = new DaemonSingleton();
+	public static interface StateChangeListener { void daemonStateChanged(); }
+	private final Set<StateChangeListener> stateChangeListeners = new HashSet<StateChangeListener>();
+
+	public static DaemonSingleton getInstance() {
+		return instance;
+	}
+	
+	public synchronized void addStateChangeListener(StateChangeListener listener) { stateChangeListeners.add(listener); }
+	public synchronized void removeStateChangeListener(StateChangeListener listener) { stateChangeListeners.remove(listener); }
+	
+	public synchronized void stopAcceptingTunnels() {
+		if(isStartedOkay()){
+			state=State.gracefulShutdownInProgress;
+			fireStateChange();
+			I2PD_JNI.stopAcceptingTunnels();
+		}
+	}
+	
+	public void onNetworkStateChange(boolean isConnected) {
+		I2PD_JNI.onNetworkStateChanged(isConnected);
+	}
+	
+	private boolean startedOkay;
+
+	public static enum State {starting,jniLibraryLoaded,startedOkay,startFailed,gracefulShutdownInProgress};
+	
+	private State state = State.starting;
+	
+	public State getState() { return state; }
+	
+	{
+		synchronized(this){
+			fireStateChange();
+			new Thread(new Runnable(){
+	
+				@Override
+				public void run() {
+					try {
+						I2PD_JNI.loadLibraries();
+						synchronized (DaemonSingleton.this) {
+							state = State.jniLibraryLoaded;
+							fireStateChange();
+						}
+					} catch (Throwable tr) {
+						lastThrowable=tr;
+						synchronized (DaemonSingleton.this) {
+							state = State.startFailed;
+							fireStateChange();
+						}
+						return;
+					}
+					try {
+						synchronized (DaemonSingleton.this) {
+							daemonStartResult = I2PD_JNI.startDaemon();
+							if("ok".equals(daemonStartResult)){state=State.startedOkay;setStartedOkay(true);}
+							else state=State.startFailed;
+							fireStateChange();
+						}
+					} catch (Throwable tr) {
+						lastThrowable=tr;
+						synchronized (DaemonSingleton.this) {
+							state = State.startFailed;
+							fireStateChange();
+						}
+						return;
+					}				
+				}
+				
+			}, "i2pdDaemonStart").start();
+		}
+	}
+	private Throwable lastThrowable;
+	private String daemonStartResult="N/A";
+
+	private synchronized void fireStateChange() {
+		Log.i(TAG, "daemon state change: "+state);
+		for(StateChangeListener listener : stateChangeListeners) {
+			try { 
+				listener.daemonStateChanged(); 
+			} catch (Throwable tr) { 
+				Log.e(TAG, "exception in listener ignored", tr); 
+			}
+		}
+	}
+
+	public Throwable getLastThrowable() {
+		return lastThrowable;
+	}
+
+	public String getDaemonStartResult() {
+		return daemonStartResult;
+	}
+	
+	private final Object startedOkayLock = new Object();
+
+	public boolean isStartedOkay() {
+		synchronized (startedOkayLock) {
+			return startedOkay;
+		}
+	}
+
+	private void setStartedOkay(boolean startedOkay) {
+		synchronized (startedOkayLock) {
+			this.startedOkay = startedOkay;
+		}
+	}
+
+	public synchronized void stopDaemon() {
+		if(isStartedOkay()){
+			try {I2PD_JNI.stopDaemon();}catch(Throwable tr){Log.e(TAG, "", tr);}
+			setStartedOkay(false);
+		}
+	}
+}

android/src/org/purplei2p/i2pd/I2PD.java

@@ -22,52 +22,47 @@ import android.widget.Toast;
 
 public class I2PD extends Activity {
 	private static final String TAG = "i2pd";
+	private DaemonSingleton daemon = DaemonSingleton.getInstance();
+	private DaemonSingleton.StateChangeListener daemonStateChangeListener = 
+			new DaemonSingleton.StateChangeListener() {
 		
-	private static Throwable loadLibsThrowable;
-	static {
+		@Override
+		public void daemonStateChanged() {
+			runOnUiThread(new Runnable(){
+
+				@Override
+				public void run() {
 					try {
-			I2PD_JNI.loadLibraries();
+						if(textView==null)return;
+						Throwable tr = daemon.getLastThrowable();
+						if(tr!=null) {
+							textView.setText(throwableToString(tr));
+							return;
+						}
+						DaemonSingleton.State state = daemon.getState();
+						textView.setText(String.valueOf(state)+
+								(DaemonSingleton.State.startFailed.equals(state)?": "+daemon.getDaemonStartResult():""));
 					} catch (Throwable tr) {
-			loadLibsThrowable = tr;
+						Log.e(TAG,"error ignored",tr);
+					}
 				}
+			});
 		}
-	private String daemonStartResult="N/A";
-	private boolean destroyed=false;
+	};
+	
 	private TextView textView;
 	
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        destroyed=false;
 
         //set the app be foreground (do not unload when RAM needed)
         doBindService();
 
         textView = new TextView(this);
         setContentView(textView);
-        if (loadLibsThrowable != null) {
-        	textView.setText(throwableToString(loadLibsThrowable)+"\r\n");
-        	return;
-        }
-        try {
-        	textView.setText( 
-        			"libi2pd.so was compiled with ABI " + getABICompiledWith() + "\r\n"+
-        			"Starting daemon... ");
-        	new Thread(new Runnable(){
-
-				@Override
-				public void run() {
-			        try {
-						doStartDaemon();
-			        } catch (final Throwable tr) {
-						appendThrowable(tr);
-			        }
-				}
-        		
-        	},"i2pdDaemonStarting").start();
-        } catch (Throwable tr) {
-        	textView.setText(textView.getText().toString()+throwableToString(tr));
-        }
+        daemonStateChangeListener.daemonStateChanged();
+        daemon.addStateChangeListener(daemonStateChangeListener);
     }
 
     @Override
@@ -76,25 +71,19 @@ public class I2PD extends Activity {
 		localDestroy();
 	}
 
-	private synchronized void localDestroy() {
-		if(destroyed)return;
-		destroyed=true;
+	private void localDestroy() {
+		textView = null;
+		daemon.removeStateChangeListener(daemonStateChangeListener);
+		Timer gracefulQuitTimer = getGracefulQuitTimer();
 		if(gracefulQuitTimer!=null) {
 			gracefulQuitTimer.cancel();
-			gracefulQuitTimer = null;
+			setGracefulQuitTimer(null);
 		}
 		try{
             doUnbindService();
 		}catch(Throwable tr){
 			Log.e(TAG, "", tr);
 		}
-		if("ok".equals(daemonStartResult)) {
-	        try {
-	        	I2PD_JNI.stopDaemon();
-	        } catch (Throwable tr) {
-	        	Log.e(TAG, "error", tr);
-	        }
-		}
 	}
 
 	private CharSequence throwableToString(Throwable tr) {
@@ -105,42 +94,6 @@ public class I2PD extends Activity {
     	return sw.toString();
 	}
 
-	public String getABICompiledWith() {
-    	return I2PD_JNI.getABICompiledWith();
-    }
-
-	private synchronized void doStartDaemon() {
-		if(destroyed)return;
-		daemonStartResult = I2PD_JNI.startDaemon();
-		runOnUiThread(new Runnable(){
-
-			@Override
-			public void run() {
-				synchronized (I2PD.this) {
-					if(destroyed)return;
-					textView.setText(
-        					textView.getText().toString()+
-        					"start result: "+daemonStartResult+"\r\n"
-        			);
-				}	
-			}
-    		
-    	});
-	}
-
-	private void appendThrowable(final Throwable tr) {
-		runOnUiThread(new Runnable(){
-
-			@Override
-			public void run() {
-				synchronized (I2PD.this) {
-					if(destroyed)return;
-					textView.setText(textView.getText().toString()+throwableToString(tr)+"\r\n");
-				}
-			}
-		});
-	}
-
 //	private LocalService mBoundService;
 
     private ServiceConnection mConnection = new ServiceConnection() {
@@ -218,7 +171,6 @@ public class I2PD extends Activity {
     @SuppressLint("NewApi")
 	private void quit() {
         try {
-            localDestroy();
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 finishAndRemoveTask();
             } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
@@ -230,11 +182,18 @@ public class I2PD extends Activity {
         }catch (Throwable tr) {
             Log.e(TAG, "", tr);
         }
+        try{
+            daemon.stopDaemon();
+	    }catch (Throwable tr) {
+	        Log.e(TAG, "", tr);
+	    }
+        System.exit(0);
     }
 
     private Timer gracefulQuitTimer;
-    private synchronized void gracefulQuit() {
-    	if(gracefulQuitTimer!=null){
+    private final Object gracefulQuitTimerLock = new Object();
+    private void gracefulQuit() {
+    	if(getGracefulQuitTimer()!=null){
 	        Toast.makeText(this, R.string.graceful_quit_is_already_in_progress,
 	        		Toast.LENGTH_SHORT).show();
     		return;
@@ -246,10 +205,11 @@ public class I2PD extends Activity {
 			@Override
 			public void run() {
 				try{
-					synchronized (I2PD.this) {
-				        if("ok".equals(daemonStartResult)) {
-				        	I2PD_JNI.stopAcceptingTunnels();
-				            gracefulQuitTimer = new Timer(true);
+					Log.d(TAG, "grac stopping");
+			        if(daemon.isStartedOkay()) {
+			        	daemon.stopAcceptingTunnels();
+			            Timer gracefulQuitTimer = new Timer(true);
+						setGracefulQuitTimer(gracefulQuitTimer);
 						gracefulQuitTimer.schedule(new TimerTask(){
 
 			    			@Override
@@ -257,11 +217,10 @@ public class I2PD extends Activity {
 			    				quit();	
 			    			}
 			            	
-				            }, 10*60*1000/*millis*/);
+			            }, 10*60*1000/*milliseconds*/);
 			        }else{
 			        	quit();
 			        }
-					}
 				} catch(Throwable tr) {
 					Log.e(TAG,"",tr);
 				}
@@ -269,4 +228,16 @@ public class I2PD extends Activity {
         	
         },"gracQuitInit").start();
     }
+
+	private Timer getGracefulQuitTimer() {
+		synchronized (gracefulQuitTimerLock) {
+			return gracefulQuitTimer;
+		}
+	}
+
+	private void setGracefulQuitTimer(Timer gracefulQuitTimer) {
+    	synchronized (gracefulQuitTimerLock) {
+    		this.gracefulQuitTimer = gracefulQuitTimer;
+    	}
+	}
 }