|
|
@ -19,13 +19,14 @@ import android.widget.TextView;
|
|
|
|
import android.widget.Toast;
|
|
|
|
import android.widget.Toast;
|
|
|
|
|
|
|
|
|
|
|
|
public class I2PDActivity extends Activity {
|
|
|
|
public class I2PDActivity extends Activity {
|
|
|
|
private static final String TAG = "i2pd";
|
|
|
|
private static final String TAG = "i2pdActvt";
|
|
|
|
|
|
|
|
public static final int GRACEFUL_DELAY_MILLIS = 10 * 60 * 1000;
|
|
|
|
|
|
|
|
|
|
|
|
private TextView textView;
|
|
|
|
private TextView textView;
|
|
|
|
|
|
|
|
|
|
|
|
private final DaemonSingleton daemon = DaemonSingleton.getInstance();
|
|
|
|
private static final DaemonSingleton daemon = DaemonSingleton.getInstance();
|
|
|
|
|
|
|
|
|
|
|
|
private DaemonSingleton.StateUpdateListener daemonStateUpdatedListener =
|
|
|
|
private final DaemonSingleton.StateUpdateListener daemonStateUpdatedListener =
|
|
|
|
new DaemonSingleton.StateUpdateListener() {
|
|
|
|
new DaemonSingleton.StateUpdateListener() {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -42,8 +43,11 @@ public class I2PDActivity extends Activity {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DaemonSingleton.State state = daemon.getState();
|
|
|
|
DaemonSingleton.State state = daemon.getState();
|
|
|
|
textView.setText(String.valueOf(state)+
|
|
|
|
textView.setText(
|
|
|
|
(DaemonSingleton.State.startFailed.equals(state)?": "+daemon.getDaemonStartResult():""));
|
|
|
|
String.valueOf(state)+
|
|
|
|
|
|
|
|
(DaemonSingleton.State.startFailed.equals(state)?": "+daemon.getDaemonStartResult():"")+
|
|
|
|
|
|
|
|
(DaemonSingleton.State.gracefulShutdownInProgress.equals(state)?": "+formatGraceTimeRemaining()+" "+getText(R.string.remaining):"")
|
|
|
|
|
|
|
|
);
|
|
|
|
} catch (Throwable tr) {
|
|
|
|
} catch (Throwable tr) {
|
|
|
|
Log.e(TAG,"error ignored",tr);
|
|
|
|
Log.e(TAG,"error ignored",tr);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -51,6 +55,18 @@ public class I2PDActivity extends Activity {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
private static volatile long graceStartedMillis;
|
|
|
|
|
|
|
|
private static final Object graceStartedMillis_LOCK=new Object();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static String formatGraceTimeRemaining() {
|
|
|
|
|
|
|
|
long remainingSeconds;
|
|
|
|
|
|
|
|
synchronized (graceStartedMillis_LOCK){
|
|
|
|
|
|
|
|
remainingSeconds=Math.round(Math.max(0,graceStartedMillis+GRACEFUL_DELAY_MILLIS-System.currentTimeMillis())/1000.0D);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
long remainingMinutes=(long)Math.floor(remainingSeconds/60.0D);
|
|
|
|
|
|
|
|
long remSec=remainingSeconds-remainingMinutes*60;
|
|
|
|
|
|
|
|
return remainingMinutes+":"+(remSec/10)+remSec%10;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
|
@ -58,35 +74,44 @@ public class I2PDActivity extends Activity {
|
|
|
|
|
|
|
|
|
|
|
|
textView = new TextView(this);
|
|
|
|
textView = new TextView(this);
|
|
|
|
setContentView(textView);
|
|
|
|
setContentView(textView);
|
|
|
|
DaemonSingleton.getInstance().addStateChangeListener(daemonStateUpdatedListener);
|
|
|
|
daemon.addStateChangeListener(daemonStateUpdatedListener);
|
|
|
|
daemonStateUpdatedListener.daemonStateUpdate();
|
|
|
|
daemonStateUpdatedListener.daemonStateUpdate();
|
|
|
|
|
|
|
|
|
|
|
|
//set the app be foreground
|
|
|
|
//set the app be foreground
|
|
|
|
doBindService();
|
|
|
|
doBindService();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
final Timer gracefulQuitTimer = getGracefulQuitTimer();
|
|
|
|
|
|
|
|
if(gracefulQuitTimer!=null){
|
|
|
|
|
|
|
|
long gracefulStopAtMillis;
|
|
|
|
|
|
|
|
synchronized (graceStartedMillis_LOCK) {
|
|
|
|
|
|
|
|
gracefulStopAtMillis = graceStartedMillis + GRACEFUL_DELAY_MILLIS;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
rescheduleGraceStop(gracefulQuitTimer, gracefulStopAtMillis);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
protected void onDestroy() {
|
|
|
|
protected void onDestroy() {
|
|
|
|
super.onDestroy();
|
|
|
|
super.onDestroy();
|
|
|
|
localDestroy();
|
|
|
|
textView = null;
|
|
|
|
}
|
|
|
|
daemon.removeStateChangeListener(daemonStateUpdatedListener);
|
|
|
|
|
|
|
|
//cancelGracefulStop();
|
|
|
|
private void localDestroy() {
|
|
|
|
try{
|
|
|
|
textView = null;
|
|
|
|
doUnbindService();
|
|
|
|
DaemonSingleton.getInstance().removeStateChangeListener(daemonStateUpdatedListener);
|
|
|
|
}catch(Throwable tr){
|
|
|
|
Timer gracefulQuitTimer = getGracefulQuitTimer();
|
|
|
|
Log.e(TAG, "", tr);
|
|
|
|
if(gracefulQuitTimer!=null) {
|
|
|
|
|
|
|
|
gracefulQuitTimer.cancel();
|
|
|
|
|
|
|
|
setGracefulQuitTimer(null);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// try{
|
|
|
|
|
|
|
|
// doUnbindService();
|
|
|
|
|
|
|
|
// }catch(Throwable tr){
|
|
|
|
|
|
|
|
// Log.e(TAG, "", tr);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private CharSequence throwableToString(Throwable tr) {
|
|
|
|
private static void cancelGracefulStop() {
|
|
|
|
|
|
|
|
Timer gracefulQuitTimer = getGracefulQuitTimer();
|
|
|
|
|
|
|
|
if(gracefulQuitTimer!=null) {
|
|
|
|
|
|
|
|
gracefulQuitTimer.cancel();
|
|
|
|
|
|
|
|
setGracefulQuitTimer(null);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private CharSequence throwableToString(Throwable tr) {
|
|
|
|
StringWriter sw = new StringWriter(8192);
|
|
|
|
StringWriter sw = new StringWriter(8192);
|
|
|
|
PrintWriter pw = new PrintWriter(sw);
|
|
|
|
PrintWriter pw = new PrintWriter(sw);
|
|
|
|
tr.printStackTrace(pw);
|
|
|
|
tr.printStackTrace(pw);
|
|
|
@ -122,24 +147,27 @@ public class I2PDActivity extends Activity {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private boolean mIsBound;
|
|
|
|
private static volatile boolean mIsBound;
|
|
|
|
|
|
|
|
|
|
|
|
private synchronized void doBindService() {
|
|
|
|
private void doBindService() {
|
|
|
|
if(mIsBound)return;
|
|
|
|
synchronized (I2PDActivity.class) {
|
|
|
|
// Establish a connection with the service. We use an explicit
|
|
|
|
if (mIsBound) return;
|
|
|
|
// class name because we want a specific service implementation that
|
|
|
|
// Establish a connection with the service. We use an explicit
|
|
|
|
// we know will be running in our own process (and thus won't be
|
|
|
|
// class name because we want a specific service implementation that
|
|
|
|
// supporting component replacement by other applications).
|
|
|
|
// we know will be running in our own process (and thus won't be
|
|
|
|
bindService(new Intent(this,
|
|
|
|
// supporting component replacement by other applications).
|
|
|
|
ForegroundService.class), mConnection, Context.BIND_AUTO_CREATE);
|
|
|
|
bindService(new Intent(this, ForegroundService.class), mConnection, Context.BIND_AUTO_CREATE);
|
|
|
|
mIsBound = true;
|
|
|
|
mIsBound = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void doUnbindService() {
|
|
|
|
private void doUnbindService() {
|
|
|
|
if (mIsBound) {
|
|
|
|
synchronized (I2PDActivity.class) {
|
|
|
|
// Detach our existing connection.
|
|
|
|
if (mIsBound) {
|
|
|
|
unbindService(mConnection);
|
|
|
|
// Detach our existing connection.
|
|
|
|
mIsBound = false;
|
|
|
|
unbindService(mConnection);
|
|
|
|
|
|
|
|
mIsBound = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -170,16 +198,25 @@ public class I2PDActivity extends Activity {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void i2pdStop() {
|
|
|
|
private void i2pdStop() {
|
|
|
|
try{
|
|
|
|
cancelGracefulStop();
|
|
|
|
daemon.stopDaemon();
|
|
|
|
new Thread(new Runnable(){
|
|
|
|
}catch (Throwable tr) {
|
|
|
|
|
|
|
|
Log.e(TAG, "", tr);
|
|
|
|
@Override
|
|
|
|
}
|
|
|
|
public void run() {
|
|
|
|
|
|
|
|
Log.d(TAG, "stopping");
|
|
|
|
|
|
|
|
try{
|
|
|
|
|
|
|
|
daemon.stopDaemon();
|
|
|
|
|
|
|
|
}catch (Throwable tr) {
|
|
|
|
|
|
|
|
Log.e(TAG, "", tr);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},"stop").start();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private Timer gracefulQuitTimer;
|
|
|
|
private static volatile Timer gracefulQuitTimer;
|
|
|
|
private final Object gracefulQuitTimerLock = new Object();
|
|
|
|
|
|
|
|
private synchronized void i2pdGracefulStop() {
|
|
|
|
private void i2pdGracefulStop() {
|
|
|
|
if(daemon.getState()==DaemonSingleton.State.stopped){
|
|
|
|
if(daemon.getState()==DaemonSingleton.State.stopped){
|
|
|
|
Toast.makeText(this, R.string.already_stopped,
|
|
|
|
Toast.makeText(this, R.string.already_stopped,
|
|
|
|
Toast.LENGTH_SHORT).show();
|
|
|
|
Toast.LENGTH_SHORT).show();
|
|
|
@ -200,16 +237,12 @@ public class I2PDActivity extends Activity {
|
|
|
|
Log.d(TAG, "grac stopping");
|
|
|
|
Log.d(TAG, "grac stopping");
|
|
|
|
if(daemon.isStartedOkay()) {
|
|
|
|
if(daemon.isStartedOkay()) {
|
|
|
|
daemon.stopAcceptingTunnels();
|
|
|
|
daemon.stopAcceptingTunnels();
|
|
|
|
Timer gracefulQuitTimer = new Timer(true);
|
|
|
|
long gracefulStopAtMillis;
|
|
|
|
setGracefulQuitTimer(gracefulQuitTimer);
|
|
|
|
synchronized (graceStartedMillis_LOCK) {
|
|
|
|
gracefulQuitTimer.schedule(new TimerTask(){
|
|
|
|
graceStartedMillis = System.currentTimeMillis();
|
|
|
|
|
|
|
|
gracefulStopAtMillis = graceStartedMillis + GRACEFUL_DELAY_MILLIS;
|
|
|
|
@Override
|
|
|
|
}
|
|
|
|
public void run() {
|
|
|
|
rescheduleGraceStop(null,gracefulStopAtMillis);
|
|
|
|
i2pdStop();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, 10*60*1000/*milliseconds*/);
|
|
|
|
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
i2pdStop();
|
|
|
|
i2pdStop();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -218,18 +251,35 @@ public class I2PDActivity extends Activity {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
},"gracQuitInit").start();
|
|
|
|
},"gracInit").start();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private Timer getGracefulQuitTimer() {
|
|
|
|
private void rescheduleGraceStop(Timer gracefulQuitTimerOld, long gracefulStopAtMillis) {
|
|
|
|
synchronized (gracefulQuitTimerLock) {
|
|
|
|
if(gracefulQuitTimerOld!=null)gracefulQuitTimerOld.cancel();
|
|
|
|
return gracefulQuitTimer;
|
|
|
|
final Timer gracefulQuitTimer = new Timer(true);
|
|
|
|
}
|
|
|
|
setGracefulQuitTimer(gracefulQuitTimer);
|
|
|
|
|
|
|
|
gracefulQuitTimer.schedule(new TimerTask(){
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void run() {
|
|
|
|
|
|
|
|
i2pdStop();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, Math.max(0,gracefulStopAtMillis-System.currentTimeMillis()));
|
|
|
|
|
|
|
|
final TimerTask tickerTask = new TimerTask() {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void run() {
|
|
|
|
|
|
|
|
daemonStateUpdatedListener.daemonStateUpdate();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
gracefulQuitTimer.scheduleAtFixedRate(tickerTask,0/*start delay*/,1000/*millis period*/);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static Timer getGracefulQuitTimer() {
|
|
|
|
|
|
|
|
return gracefulQuitTimer;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void setGracefulQuitTimer(Timer gracefulQuitTimer) {
|
|
|
|
private static void setGracefulQuitTimer(Timer gracefulQuitTimer) {
|
|
|
|
synchronized (gracefulQuitTimerLock) {
|
|
|
|
I2PDActivity.gracefulQuitTimer = gracefulQuitTimer;
|
|
|
|
this.gracefulQuitTimer = gracefulQuitTimer;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|