mirror of https://github.com/M66B/FairEmail.git
Moved edit account/identity to setup
This commit is contained in:
parent
4467a088ea
commit
52149e304a
|
@ -19,11 +19,19 @@ package eu.faircode.email;
|
||||||
Copyright 2018 by Marcel Bokhorst (M66B)
|
Copyright 2018 by Marcel Bokhorst (M66B)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.IntentFilter;
|
||||||
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.support.v4.content.LocalBroadcastManager;
|
||||||
|
|
||||||
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_IDENTITY = BuildConfig.APPLICATION_ID + ".EDIT_IDENTITY";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
@ -38,9 +46,45 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
|
||||||
|
IntentFilter iff = new IntentFilter();
|
||||||
|
iff.addAction(ACTION_EDIT_ACCOUNT);
|
||||||
|
iff.addAction(ACTION_EDIT_IDENTITY);
|
||||||
|
lbm.registerReceiver(receiver, iff);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
|
||||||
|
lbm.unregisterReceiver(receiver);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackStackChanged() {
|
public void onBackStackChanged() {
|
||||||
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
if (getSupportFragmentManager().getBackStackEntryCount() == 0)
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BroadcastReceiver receiver = new BroadcastReceiver() {
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
if (ACTION_EDIT_ACCOUNT.equals(intent.getAction())) {
|
||||||
|
FragmentAccount fragment = new FragmentAccount();
|
||||||
|
fragment.setArguments(intent.getExtras());
|
||||||
|
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
||||||
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account");
|
||||||
|
fragmentTransaction.commit();
|
||||||
|
} else if (ACTION_EDIT_IDENTITY.equals(intent.getAction())) {
|
||||||
|
FragmentIdentity fragment = new FragmentIdentity();
|
||||||
|
fragment.setArguments(intent.getExtras());
|
||||||
|
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
||||||
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity");
|
||||||
|
fragmentTransaction.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,8 +71,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
static final String ACTION_VIEW_MESSAGES = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGES";
|
static final String ACTION_VIEW_MESSAGES = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGES";
|
||||||
static final String ACTION_VIEW_MESSAGE = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGE";
|
static final String ACTION_VIEW_MESSAGE = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGE";
|
||||||
static final String ACTION_EDIT_FOLDER = BuildConfig.APPLICATION_ID + ".EDIT_FOLDER";
|
static final String ACTION_EDIT_FOLDER = BuildConfig.APPLICATION_ID + ".EDIT_FOLDER";
|
||||||
static final String ACTION_EDIT_ACCOUNT = BuildConfig.APPLICATION_ID + ".EDIT_ACCOUNT";
|
|
||||||
static final String ACTION_EDIT_IDENTITY = BuildConfig.APPLICATION_ID + ".EDIT_IDENTITY";
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
@ -147,8 +145,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
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);
|
||||||
iff.addAction(ACTION_EDIT_ACCOUNT);
|
|
||||||
iff.addAction(ACTION_EDIT_IDENTITY);
|
|
||||||
lbm.registerReceiver(receiver, iff);
|
lbm.registerReceiver(receiver, iff);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -392,18 +388,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
||||||
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("folder");
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("folder");
|
||||||
fragmentTransaction.commit();
|
fragmentTransaction.commit();
|
||||||
} else if (ACTION_EDIT_ACCOUNT.equals(intent.getAction())) {
|
|
||||||
FragmentAccount fragment = new FragmentAccount();
|
|
||||||
fragment.setArguments(intent.getExtras());
|
|
||||||
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
|
||||||
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account");
|
|
||||||
fragmentTransaction.commit();
|
|
||||||
} else if (ACTION_EDIT_IDENTITY.equals(intent.getAction())) {
|
|
||||||
FragmentIdentity fragment = new FragmentIdentity();
|
|
||||||
fragment.setArguments(intent.getExtras());
|
|
||||||
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
|
||||||
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity");
|
|
||||||
fragmentTransaction.commit();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -79,7 +79,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
|
||||||
|
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
||||||
lbm.sendBroadcast(
|
lbm.sendBroadcast(
|
||||||
new Intent(ActivityView.ACTION_EDIT_ACCOUNT)
|
new Intent(ActivitySetup.ACTION_EDIT_ACCOUNT)
|
||||||
.putExtra("id", account.id));
|
.putExtra("id", account.id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
|
||||||
|
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
||||||
lbm.sendBroadcast(
|
lbm.sendBroadcast(
|
||||||
new Intent(ActivityView.ACTION_EDIT_IDENTITY)
|
new Intent(ActivitySetup.ACTION_EDIT_IDENTITY)
|
||||||
.putExtra("id", identity.id));
|
.putExtra("id", identity.id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue