Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

merge and update

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-26 10:59:58 +02:00
parent ef3b41dc1d
commit e809aaa932
27 changed files with 187 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,7 @@ package org.briarproject.android;
import android.os.Bundle;
import android.os.IBinder;
import android.os.PersistableBundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
@@ -44,6 +42,10 @@ public abstract class BaseActivity extends AppCompatActivity {
.build();
injectActivity(activityComponent);
for (ActivityLifecycleController alc : lifecycleControllers) {
alc.onActivityCreate();
}
}
@Override
@@ -51,9 +53,9 @@ public abstract class BaseActivity extends AppCompatActivity {
super.onPostCreate(savedInstanceState);
// Post call used for controllers to ensure that the onCreate method
// override in inherited Activities has finished
for (ActivityLifecycleController alc : lifecycleControllers) {
alc.onActivityCreate();
}
// for (ActivityLifecycleController alc : lifecycleControllers) {
// alc.onActivityCreate();
// }
}
@Override