Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-05-05 23:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

reworked android. added a build script.

Browse source
This commit is contained in:
hypnosis-i2p 2016-07-13 11:03:11 +08:00
parent fac6229e43
commit 814f60a512
7 changed files with 305 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

108
android/src/org/purplei2p/i2pd/DaemonSingleton.java Normal file
View file

@ -0,0 +1,108 @@
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 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; }
{
fireStateChange();
new Thread(new Runnable(){
@Override
public void run() {
try {
I2PD_JNI.loadLibraries();
state = State.jniLibraryLoaded;
fireStateChange();
} catch (Throwable tr) {
lastThrowable=tr;
state = State.startFailed;
fireStateChange();
return;
}
try {
daemonStartResult = I2PD_JNI.startDaemon();
if("ok".equals(daemonStartResult)){state=State.startedOkay;setStartedOkay(true);}
else state=State.startFailed;
fireStateChange();
} catch (Throwable tr) {
lastThrowable=tr;
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;
}
public synchronized boolean isStartedOkay() {
return startedOkay;
}
private synchronized void setStartedOkay(boolean startedOkay) {
this.startedOkay = startedOkay;
}
public void stopDaemon() {
if(isStartedOkay()){
try {I2PD_JNI.stopDaemon();}catch(Throwable tr){Log.e(TAG, "", tr);}
setStartedOkay(false);
}
}
}

175
android/src/org/purplei2p/i2pd/I2PD.java
View file

@ -5,6 +5,8 @@ import java.io.StringWriter;
import java.util.Timer;
import java.util.TimerTask;
import org.purplei2p.i2pd.DaemonSingleton.State;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.ComponentName;
@ -22,52 +24,47 @@ import android.widget.Toast;
public class I2PD extends Activity {
private static final String TAG = "i2pd";
private static Throwable loadLibsThrowable;
static {
try {
I2PD_JNI.loadLibraries();
} catch (Throwable tr) {
loadLibsThrowable = tr;
private DaemonSingleton daemon = DaemonSingleton.getInstance();
private DaemonSingleton.StateChangeListener daemonStateChangeListener =
new DaemonSingleton.StateChangeListener() {
@Override
public void daemonStateChanged() {
runOnUiThread(new Runnable(){
@Override
public void run() {
try {
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) {
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 +73,18 @@ public class I2PD extends Activity {
localDestroy();
}
private synchronized void localDestroy() {
if(destroyed)return;
destroyed=true;
if(gracefulQuitTimer!=null) {
gracefulQuitTimer.cancel();
gracefulQuitTimer = null;
private void localDestroy() {
textView = null;
daemon.removeStateChangeListener(daemonStateChangeListener);
if(getGracefulQuitTimer()!=null) {
getGracefulQuitTimer().cancel();
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 +95,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 +172,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 +183,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 Timer gracefulQuitTimer;
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,22 +206,21 @@ public class I2PD extends Activity {
@Override
public void run() {
try{
synchronized (I2PD.this) {
if("ok".equals(daemonStartResult)) {
I2PD_JNI.stopAcceptingTunnels();
gracefulQuitTimer = new Timer(true);
gracefulQuitTimer.schedule(new TimerTask(){
Log.d(TAG, "grac stopping");
if(daemon.isStartedOkay()) {
daemon.stopAcceptingTunnels();
setGracefulQuitTimer(new Timer(true));
getGracefulQuitTimer().schedule(new TimerTask(){
@Override
public void run() {
quit();
}
}, 10*60*1000/*millis*/);
}else{
quit();
}
}
@Override
public void run() {
quit();
}
}, 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;
}
}
}