From 2f68b308873815c1c9032d27e22a6db31399fe87 Mon Sep 17 00:00:00 2001 From: str4d Date: Fri, 12 Dec 2014 23:08:58 +0000 Subject: [PATCH] Only call connectNow() if status==DELAY; always call when I2P status==ACTIVE --- .../main/java/i2p/bote/android/service/BoteService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/i2p/bote/android/service/BoteService.java b/app/src/main/java/i2p/bote/android/service/BoteService.java index b00049e..defe809 100644 --- a/app/src/main/java/i2p/bote/android/service/BoteService.java +++ b/app/src/main/java/i2p/bote/android/service/BoteService.java @@ -36,6 +36,7 @@ import i2p.bote.email.Email; import i2p.bote.fileencryption.PasswordException; import i2p.bote.folder.EmailFolder; import i2p.bote.folder.NewEmailListener; +import i2p.bote.network.NetworkStatus; import i2p.bote.network.NetworkStatusListener; public class BoteService extends Service implements NetworkStatusListener, NewEmailListener { @@ -151,7 +152,8 @@ public class BoteService extends Service implements NetworkStatusListener, NewEm try { mStateService.registerCallback(mStatusListener); final State state = mStateService.getState(); - if (state == State.ACTIVE) + if (state == State.ACTIVE && + I2PBote.getInstance().getNetworkStatus() == NetworkStatus.DELAY) I2PBote.getInstance().connectNow(); } catch (RemoteException e) { // TODO Auto-generated catch block @@ -169,7 +171,10 @@ public class BoteService extends Service implements NetworkStatusListener, NewEm private final IRouterStateCallback.Stub mStatusListener = new IRouterStateCallback.Stub() { public void stateChanged(State newState) throws RemoteException { - if (newState == State.STOPPING || + if (newState == State.ACTIVE && + I2PBote.getInstance().getNetworkStatus() == NetworkStatus.DELAY) + I2PBote.getInstance().connectNow(); + else if (newState == State.STOPPING || newState == State.MANUAL_STOPPING || newState == State.MANUAL_QUITTING || newState == State.NETWORK_STOPPING)