mirror of https://github.com/M66B/FairEmail.git
parent
3bdbb09de2
commit
c8f48b0f65
|
@ -25,7 +25,9 @@
|
||||||
android:name="android.webkit.WebView.EnableSafeBrowsing"
|
android:name="android.webkit.WebView.EnableSafeBrowsing"
|
||||||
android:value="false" />
|
android:value="false" />
|
||||||
|
|
||||||
<activity android:name=".ActivitySetup" />
|
<activity
|
||||||
|
android:name=".ActivitySetup"
|
||||||
|
android:parentActivityName=".ActivityView" />
|
||||||
|
|
||||||
<activity android:name=".ActivityView">
|
<activity android:name=".ActivityView">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
|
@ -35,7 +37,9 @@
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name=".ActivityCompose" />
|
<activity
|
||||||
|
android:name=".ActivityCompose"
|
||||||
|
android:parentActivityName=".ActivityView" />
|
||||||
|
|
||||||
<service android:name=".ServiceSynchronize" />
|
<service android:name=".ServiceSynchronize" />
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ package eu.faircode.email;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.FragmentManager;
|
import android.support.v4.app.FragmentManager;
|
||||||
import android.support.v4.app.FragmentTransaction;
|
import android.support.v4.app.FragmentTransaction;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
|
||||||
public class ActivityCompose extends ActivityBase implements FragmentManager.OnBackStackChangedListener {
|
public class ActivityCompose extends ActivityBase implements FragmentManager.OnBackStackChangedListener {
|
||||||
static final int LOADER_COMPOSE_GET = 1;
|
static final int LOADER_COMPOSE_GET = 1;
|
||||||
|
@ -37,6 +38,8 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_compose);
|
setContentView(R.layout.activity_compose);
|
||||||
|
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
getSupportFragmentManager().addOnBackStackChangedListener(this);
|
getSupportFragmentManager().addOnBackStackChangedListener(this);
|
||||||
|
|
||||||
if (getSupportFragmentManager().getFragments().size() == 0) {
|
if (getSupportFragmentManager().getFragments().size() == 0) {
|
||||||
|
@ -53,6 +56,16 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case android.R.id.home:
|
||||||
|
finish();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackStackChanged() {
|
public void onBackStackChanged() {
|
||||||
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
||||||
|
|
|
@ -27,6 +27,7 @@ import android.os.Bundle;
|
||||||
import android.support.v4.app.FragmentManager;
|
import android.support.v4.app.FragmentManager;
|
||||||
import android.support.v4.app.FragmentTransaction;
|
import android.support.v4.app.FragmentTransaction;
|
||||||
import android.support.v4.content.LocalBroadcastManager;
|
import android.support.v4.content.LocalBroadcastManager;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
|
||||||
public class ActivitySetup extends ActivityBase implements FragmentManager.OnBackStackChangedListener {
|
public class ActivitySetup extends ActivityBase implements FragmentManager.OnBackStackChangedListener {
|
||||||
static final String ACTION_EDIT_ACCOUNT = BuildConfig.APPLICATION_ID + ".EDIT_ACCOUNT";
|
static final String ACTION_EDIT_ACCOUNT = BuildConfig.APPLICATION_ID + ".EDIT_ACCOUNT";
|
||||||
|
@ -37,6 +38,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_setup);
|
setContentView(R.layout.activity_setup);
|
||||||
|
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
getSupportFragmentManager().addOnBackStackChangedListener(this);
|
getSupportFragmentManager().addOnBackStackChangedListener(this);
|
||||||
|
|
||||||
if (getSupportFragmentManager().getFragments().size() == 0) {
|
if (getSupportFragmentManager().getFragments().size() == 0) {
|
||||||
|
@ -63,6 +66,16 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
|
||||||
lbm.unregisterReceiver(receiver);
|
lbm.unregisterReceiver(receiver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case android.R.id.home:
|
||||||
|
finish();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackStackChanged() {
|
public void onBackStackChanged() {
|
||||||
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
||||||
|
|
|
@ -135,6 +135,7 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
protected void onPostCreate(Bundle savedInstanceState) {
|
||||||
super.onPostCreate(savedInstanceState);
|
super.onPostCreate(savedInstanceState);
|
||||||
drawerToggle.syncState();
|
drawerToggle.syncState();
|
||||||
|
syncState();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -159,6 +160,7 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
public void onConfigurationChanged(Configuration newConfig) {
|
public void onConfigurationChanged(Configuration newConfig) {
|
||||||
super.onConfigurationChanged(newConfig);
|
super.onConfigurationChanged(newConfig);
|
||||||
drawerToggle.onConfigurationChanged(newConfig);
|
drawerToggle.onConfigurationChanged(newConfig);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -188,6 +190,14 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
finish();
|
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))
|
||||||
|
@ -197,10 +207,10 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
}
|
}
|
||||||
|
|
||||||
private void init() {
|
private void init() {
|
||||||
|
syncState();
|
||||||
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
if (prefs.getBoolean("eula", false)) {
|
if (prefs.getBoolean("eula", false)) {
|
||||||
drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
|
|
||||||
|
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putLong("folder", -1);
|
args.putLong("folder", -1);
|
||||||
|
|
||||||
|
@ -225,8 +235,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
|
|
||||||
|
|
||||||
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
||||||
fragmentTransaction.replace(R.id.content_frame, new FragmentEula(), "eula");
|
fragmentTransaction.replace(R.id.content_frame, new FragmentEula(), "eula");
|
||||||
fragmentTransaction.commit();
|
fragmentTransaction.commit();
|
||||||
|
@ -234,7 +242,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateDrawer() {
|
public void updateDrawer() {
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
|
||||||
ArrayAdapterDrawer drawerArray = new ArrayAdapterDrawer(this, R.layout.item_drawer);
|
ArrayAdapterDrawer drawerArray = new ArrayAdapterDrawer(this, R.layout.item_drawer);
|
||||||
drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_unified));
|
drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_unified));
|
||||||
drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_folders));
|
drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_folders));
|
||||||
|
|
Loading…
Reference in New Issue