Delay loading of tunnels and addressbook until router is running
This should help avoid a race condition where the RouterContext is available before the Router is fully-initialised (see ticket #2092).
This commit is contained in:
@ -151,7 +151,10 @@ public class TunnelListFragment extends Fragment implements
|
||||
|
||||
public void updateState(State state) {
|
||||
try {
|
||||
if (state == State.STOPPING || state == State.STOPPED ||
|
||||
if (state == State.INIT ||
|
||||
state == State.STARTING || // Wait until RouterContext is initialised
|
||||
state == State.STOPPING ||
|
||||
state == State.STOPPED ||
|
||||
state == State.MANUAL_STOPPING ||
|
||||
state == State.MANUAL_STOPPED ||
|
||||
state == State.MANUAL_QUITTING ||
|
||||
|
@ -168,7 +168,10 @@ public class AddressbookFragment extends Fragment implements
|
||||
|
||||
try {
|
||||
LoaderManager manager = getLoaderManager();
|
||||
if (state == State.STOPPING || state == State.STOPPED ||
|
||||
if (state == State.INIT ||
|
||||
state == State.STARTING || // Wait until RouterContext is initialised
|
||||
state == State.STOPPING ||
|
||||
state == State.STOPPED ||
|
||||
state == State.MANUAL_STOPPING ||
|
||||
state == State.MANUAL_STOPPED ||
|
||||
state == State.MANUAL_QUITTING ||
|
||||
|
Reference in New Issue
Block a user