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

Trimmed some Roboguice boilerplate.

Browse Source
This commit is contained in:
akwizgran
2015-12-15 14:00:51 +00:00
parent e7e7bf35ea
commit d99df73380
2 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import roboguice.activity.event.OnResumeEvent;
import roboguice.activity.event.OnStartEvent; import roboguice.activity.event.OnStartEvent;
import roboguice.activity.event.OnStopEvent; import roboguice.activity.event.OnStopEvent;
import roboguice.event.EventManager; import roboguice.event.EventManager;
import roboguice.inject.ContentViewListener;
import roboguice.inject.RoboInjector; import roboguice.inject.RoboInjector;
import roboguice.util.RoboContext; import roboguice.util.RoboContext;
@@ -34,20 +33,20 @@ import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS; import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
public abstract class BaseActivity extends AppCompatActivity implements RoboContext { public abstract class BaseActivity extends AppCompatActivity
implements RoboContext {
private final static String PREFS_DB = "db"; private final static String PREFS_DB = "db";
private final static String KEY_DB_KEY = "key"; private final static String KEY_DB_KEY = "key";
protected EventManager eventManager; private final HashMap<Key<?>, Object> scopedObjects =
protected HashMap<Key<?>, Object> scopedObjects = new HashMap(); new HashMap<Key<?>, Object>();
@Inject
ContentViewListener ignored; @Inject private EventManager eventManager;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
RoboInjector injector = RoboGuice.getInjector(this); RoboInjector injector = RoboGuice.getInjector(this);
eventManager = (EventManager) injector.getInstance(EventManager.class);
injector.injectMembersWithoutViews(this); injector.injectMembersWithoutViews(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
eventManager.fire(new OnCreateEvent(savedInstanceState)); eventManager.fire(new OnCreateEvent(savedInstanceState));
@@ -105,7 +104,8 @@ public abstract class BaseActivity extends AppCompatActivity implements RoboCont
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
Configuration currentConfig = getResources().getConfiguration(); Configuration currentConfig = getResources().getConfiguration();
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
eventManager.fire(new OnConfigurationChangedEvent(currentConfig, newConfig)); eventManager.fire(new OnConfigurationChangedEvent(currentConfig,
newConfig));
} }
public void onContentChanged() { public void onContentChanged() {
@@ -114,9 +114,11 @@ public abstract class BaseActivity extends AppCompatActivity implements RoboCont
eventManager.fire(new OnContentChangedEvent()); eventManager.fire(new OnContentChangedEvent());
} }
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode,
Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
eventManager.fire(new OnActivityResultEvent(requestCode, resultCode, data)); eventManager.fire(new OnActivityResultEvent(requestCode, resultCode,
data));
} }
@Override @Override
@@ -139,7 +141,7 @@ public abstract class BaseActivity extends AppCompatActivity implements RoboCont
} }
protected void clearDbPrefs() { protected void clearDbPrefs() {
this.clearPrefs(PREFS_DB); clearPrefs(PREFS_DB);
} }
protected void gotoAndFinish(Class classInstance, int resultCode) { protected void gotoAndFinish(Class classInstance, int resultCode) {

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

@@ -1,15 +1,9 @@
package org.briarproject.android; package org.briarproject.android;
import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; import android.annotation.SuppressLint;
import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; import android.content.Intent;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import android.os.Bundle;
import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import android.os.IBinder;
import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.android.BriarService.BriarBinder; import org.briarproject.android.BriarService.BriarBinder;
import org.briarproject.android.BriarService.BriarServiceConnection; import org.briarproject.android.BriarService.BriarServiceConnection;
@@ -17,12 +11,13 @@ import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.db.DatabaseExecutor; import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.lifecycle.LifecycleManager; import org.briarproject.api.lifecycle.LifecycleManager;
import roboguice.activity.RoboActivity; import java.util.concurrent.Executor;
import android.annotation.SuppressLint; import java.util.logging.Logger;
import android.content.Intent;
import android.os.Bundle; import javax.inject.Inject;
import android.os.IBinder;
import android.view.inputmethod.InputMethodManager; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
@SuppressLint("Registered") @SuppressLint("Registered")
public class BriarActivity extends BaseActivity { public class BriarActivity extends BaseActivity {
@@ -136,9 +131,4 @@ public class BriarActivity extends BaseActivity {
} }
}); });
} }
protected void hideSoftKeyboard() {
Object o = getSystemService(INPUT_METHOD_SERVICE);
((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
}
} }