Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix transport update

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-08 12:03:01 +02:00
parent a14e981236
commit 604cfd5202
4 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/org/briarproject/android/BaseActivity.java
View File

@@ -4,6 +4,7 @@ import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
@@ -46,13 +47,13 @@ public abstract class BaseActivity extends AppCompatActivity {
} }
@Override @Override
public void onPostCreate(Bundle savedInstanceState, public void onPostCreate(Bundle savedInstanceState) {
PersistableBundle persistentState) { super.onPostCreate(savedInstanceState);
super.onPostCreate(savedInstanceState, persistentState); // Post call used for controllers to ensure that the onCreate method
// override in inherited Activities has finished
for (ActivityLifecycleController alc : lifecycleControllers) { for (ActivityLifecycleController alc : lifecycleControllers) {
alc.onActivityCreate(); alc.onActivityCreate();
} }
} }
@Override @Override

16
briar-android/src/org/briarproject/android/BriarActivity.java
View File

@@ -39,21 +39,6 @@ public abstract class BriarActivity extends BaseActivity {
private static final Logger LOG = private static final Logger LOG =
Logger.getLogger(BriarActivity.class.getName()); Logger.getLogger(BriarActivity.class.getName());
/*
private final BriarServiceConnection serviceConnection =
new BriarServiceConnection();
@Inject
DatabaseConfig databaseConfig;
private boolean bound = false;
// Fields that are accessed from background threads must be volatile
@Inject
@DatabaseExecutor
protected volatile Executor dbExecutor;
@Inject
protected volatile LifecycleManager lifecycleManager;
*/
@Inject @Inject
protected BriarController briarController; protected BriarController briarController;
@@ -62,7 +47,6 @@ public abstract class BriarActivity extends BaseActivity {
super.onCreate(state); super.onCreate(state);
briarController.startAndBindService(); briarController.startAndBindService();
// if (databaseConfig.getEncryptionKey() != null) startAndBindService();
} }
@Override @Override

3
briar-android/src/org/briarproject/android/NavDrawerActivity.java
View File

@@ -10,6 +10,7 @@ import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -203,7 +204,7 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
} }
@Override @Override
protected void onPostCreate(Bundle savedInstanceState) { public void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState); super.onPostCreate(savedInstanceState);
drawerToggle.syncState(); drawerToggle.syncState();
} }

23
briar-android/src/org/briarproject/android/controller/NavDrawerControllerImp.java
View File

@@ -17,7 +17,6 @@ import org.briarproject.api.plugins.PluginManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
@@ -54,13 +53,13 @@ public class NavDrawerControllerImp extends BriarControllerImp
@Override @Override
public void onActivityCreate() { public void onActivityCreate() {
super.onActivityCreate(); super.onActivityCreate();
initializeTransports();
} }
@Override @Override
public void onActivityResume() { public void onActivityResume() {
super.onActivityResume(); super.onActivityResume();
eventBus.addListener(this); eventBus.addListener(this);
LOG.info("onActivityResume");
} }
@Override @Override
@@ -97,12 +96,12 @@ public class NavDrawerControllerImp extends BriarControllerImp
}); });
} }
private void initializeTransports() { // private void initializeTransports() {
transports.clear(); // transports.clear();
transports.add(pluginManager.getPlugin(new TransportId("tor"))); // transports.add(pluginManager.getPlugin(new TransportId("tor")));
transports.add(pluginManager.getPlugin(new TransportId("bt"))); // transports.add(pluginManager.getPlugin(new TransportId("bt")));
transports.add(pluginManager.getPlugin(new TransportId("lan"))); // transports.add(pluginManager.getPlugin(new TransportId("lan")));
} // }
@Override @Override
public void setTransportListener(TransportStateListener transportListener) { public void setTransportListener(TransportStateListener transportListener) {
@@ -111,12 +110,8 @@ public class NavDrawerControllerImp extends BriarControllerImp
@Override @Override
public boolean transportRunning(TransportId transportId) { public boolean transportRunning(TransportId transportId) {
for (Plugin transport : transports) { Plugin plugin = pluginManager.getPlugin(transportId);
if (transport.getId().equals(transportId)) { return plugin != null && plugin.isRunning();
return transport.isRunning();
}
}
return false;
} }
@Override @Override