mirror of https://github.com/M66B/FairEmail.git
Handle new intents
This commit is contained in:
parent
fccca5ee4e
commit
c748c96d98
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".ActivitySetup"
|
android:name=".ActivitySetup"
|
||||||
|
android:launchMode="singleTop"
|
||||||
android:parentActivityName=".ActivityView" />
|
android:parentActivityName=".ActivityView" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
|
|
|
@ -58,6 +58,7 @@ import javax.mail.Address;
|
||||||
import javax.mail.internet.InternetAddress;
|
import javax.mail.internet.InternetAddress;
|
||||||
|
|
||||||
public class ActivityView extends ActivityBase implements FragmentManager.OnBackStackChangedListener, SharedPreferences.OnSharedPreferenceChangeListener {
|
public class ActivityView extends ActivityBase implements FragmentManager.OnBackStackChangedListener, SharedPreferences.OnSharedPreferenceChangeListener {
|
||||||
|
private boolean newIntent = false;
|
||||||
private DrawerLayout drawerLayout;
|
private DrawerLayout drawerLayout;
|
||||||
private ListView drawerList;
|
private ListView drawerList;
|
||||||
private ActionBarDrawerToggle drawerToggle;
|
private ActionBarDrawerToggle drawerToggle;
|
||||||
|
@ -78,6 +79,7 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
Log.i(Helper.TAG, "View create");
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
setContentView(R.layout.activity_view);
|
setContentView(R.layout.activity_view);
|
||||||
|
@ -134,6 +136,7 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
protected void onPostCreate(Bundle savedInstanceState) {
|
||||||
|
Log.i(Helper.TAG, "View post create");
|
||||||
super.onPostCreate(savedInstanceState);
|
super.onPostCreate(savedInstanceState);
|
||||||
drawerToggle.syncState();
|
drawerToggle.syncState();
|
||||||
syncState();
|
syncState();
|
||||||
|
@ -141,22 +144,74 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onResume() {
|
protected void onResume() {
|
||||||
|
Log.i(Helper.TAG, "View resume");
|
||||||
super.onResume();
|
super.onResume();
|
||||||
|
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
|
||||||
IntentFilter iff = new IntentFilter();
|
IntentFilter iff = new IntentFilter();
|
||||||
iff.addAction(ACTION_VIEW_MESSAGES);
|
iff.addAction(ACTION_VIEW_MESSAGES);
|
||||||
iff.addAction(ACTION_VIEW_MESSAGE);
|
iff.addAction(ACTION_VIEW_MESSAGE);
|
||||||
iff.addAction(ACTION_EDIT_FOLDER);
|
iff.addAction(ACTION_EDIT_FOLDER);
|
||||||
lbm.registerReceiver(receiver, iff);
|
lbm.registerReceiver(receiver, iff);
|
||||||
|
|
||||||
|
if (newIntent) {
|
||||||
|
newIntent = false;
|
||||||
|
getSupportFragmentManager().popBackStack("unified", 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
|
Log.i(Helper.TAG, "View pause");
|
||||||
super.onPause();
|
super.onPause();
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
|
||||||
lbm.unregisterReceiver(receiver);
|
lbm.unregisterReceiver(receiver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onNewIntent(Intent intent) {
|
||||||
|
Log.i(Helper.TAG, "View new intent=" + intent);
|
||||||
|
newIntent = true;
|
||||||
|
super.onNewIntent(intent);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onConfigurationChanged(Configuration newConfig) {
|
||||||
|
Log.i(Helper.TAG, "View configuration changed");
|
||||||
|
super.onConfigurationChanged(newConfig);
|
||||||
|
drawerToggle.onConfigurationChanged(newConfig);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDestroy() {
|
||||||
|
Log.i(Helper.TAG, "View destroyed");
|
||||||
|
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
if (drawerLayout.isDrawerOpen(drawerList))
|
||||||
|
drawerLayout.closeDrawer(drawerList);
|
||||||
|
else
|
||||||
|
super.onBackPressed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackStackChanged() {
|
||||||
|
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
|
||||||
|
super.onSharedPreferenceChanged(prefs, key);
|
||||||
|
if ("eula".equals(key))
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
MenuInflater inflater = getMenuInflater();
|
MenuInflater inflater = getMenuInflater();
|
||||||
|
@ -171,55 +226,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
return super.onPrepareOptionsMenu(menu);
|
return super.onPrepareOptionsMenu(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onNewIntent(Intent intent) {
|
|
||||||
Log.i(Helper.TAG, "New intent=" + intent);
|
|
||||||
getSupportFragmentManager().popBackStack("unified", 0);
|
|
||||||
super.onNewIntent(intent);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onConfigurationChanged(Configuration newConfig) {
|
|
||||||
super.onConfigurationChanged(newConfig);
|
|
||||||
drawerToggle.onConfigurationChanged(newConfig);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
if (drawerLayout.isDrawerOpen(drawerList))
|
|
||||||
drawerLayout.closeDrawer(drawerList);
|
|
||||||
else
|
|
||||||
super.onBackPressed();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDestroy() {
|
|
||||||
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
|
|
||||||
super.onDestroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
|
|
||||||
super.onSharedPreferenceChanged(prefs, key);
|
|
||||||
if ("eula".equals(key))
|
|
||||||
init();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackStackChanged() {
|
|
||||||
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void syncState() {
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
|
||||||
boolean eula = prefs.getBoolean("eula", false);
|
|
||||||
drawerToggle.setDrawerIndicatorEnabled(eula);
|
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(eula);
|
|
||||||
getSupportActionBar().setHomeButtonEnabled(eula);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
if (drawerToggle.onOptionsItemSelected(item))
|
if (drawerToggle.onOptionsItemSelected(item))
|
||||||
|
@ -234,6 +240,14 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void syncState() {
|
||||||
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
|
boolean eula = prefs.getBoolean("eula", false);
|
||||||
|
drawerToggle.setDrawerIndicatorEnabled(eula);
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(eula);
|
||||||
|
getSupportActionBar().setHomeButtonEnabled(eula);
|
||||||
|
}
|
||||||
|
|
||||||
private void init() {
|
private void init() {
|
||||||
syncState();
|
syncState();
|
||||||
invalidateOptionsMenu();
|
invalidateOptionsMenu();
|
||||||
|
|
Loading…
Reference in New Issue