mirror of https://github.com/M66B/FairEmail.git
Refactoring
This commit is contained in:
parent
8c83cf3f96
commit
cd8c1fabe6
|
@ -631,15 +631,28 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
BroadcastReceiver receiver = new BroadcastReceiver() {
|
BroadcastReceiver receiver = new BroadcastReceiver() {
|
||||||
@Override
|
@Override
|
||||||
public void onReceive(Context context, Intent intent) {
|
public void onReceive(Context context, Intent intent) {
|
||||||
if (ACTION_VIEW_MESSAGES.equals(intent.getAction())) {
|
if (ACTION_VIEW_MESSAGES.equals(intent.getAction()))
|
||||||
|
onViewMessages(intent);
|
||||||
|
else if (ACTION_VIEW_MESSAGE.equals(intent.getAction()))
|
||||||
|
onViewMessage(intent);
|
||||||
|
else if (ACTION_EDIT_FOLDER.equals(intent.getAction()))
|
||||||
|
onEditFolder(intent);
|
||||||
|
else if (ACTION_STORE_ATTACHMENT.equals(intent.getAction()))
|
||||||
|
onStoreAttachment(intent);
|
||||||
|
else if (ACTION_ACTIVATE_PRO.equals(intent.getAction()))
|
||||||
|
onActivatePro(intent);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private void onViewMessages(Intent intent) {
|
||||||
FragmentMessages fragment = new FragmentMessages();
|
FragmentMessages fragment = new FragmentMessages();
|
||||||
fragment.setArguments(intent.getExtras());
|
fragment.setArguments(intent.getExtras());
|
||||||
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
||||||
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("messages");
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("messages");
|
||||||
fragmentTransaction.commit();
|
fragmentTransaction.commit();
|
||||||
|
}
|
||||||
|
|
||||||
} else if (ACTION_VIEW_MESSAGE.equals(intent.getAction())) {
|
private void onViewMessage(Intent intent) {
|
||||||
|
|
||||||
new SimpleTask<Void>() {
|
new SimpleTask<Void>() {
|
||||||
@Override
|
@Override
|
||||||
protected Void onLoad(Context context, Bundle args) {
|
protected Void onLoad(Context context, Bundle args) {
|
||||||
|
@ -681,22 +694,25 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
|
Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
}.load(ActivityView.this, intent.getExtras());
|
}.load(ActivityView.this, intent.getExtras());
|
||||||
|
}
|
||||||
|
|
||||||
} else if (ACTION_EDIT_FOLDER.equals(intent.getAction())) {
|
private void onEditFolder(Intent intent) {
|
||||||
FragmentFolder fragment = new FragmentFolder();
|
FragmentFolder fragment = new FragmentFolder();
|
||||||
fragment.setArguments(intent.getExtras());
|
fragment.setArguments(intent.getExtras());
|
||||||
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_STORE_ATTACHMENT.equals(intent.getAction())) {
|
private void onStoreAttachment(Intent intent) {
|
||||||
Intent create = new Intent(Intent.ACTION_CREATE_DOCUMENT);
|
Intent create = new Intent(Intent.ACTION_CREATE_DOCUMENT);
|
||||||
create.addCategory(Intent.CATEGORY_OPENABLE);
|
create.addCategory(Intent.CATEGORY_OPENABLE);
|
||||||
create.setType(intent.getStringExtra("type"));
|
create.setType(intent.getStringExtra("type"));
|
||||||
create.putExtra(Intent.EXTRA_TITLE, intent.getStringExtra("name"));
|
create.putExtra(Intent.EXTRA_TITLE, intent.getStringExtra("name"));
|
||||||
startActivityForResult(create, (int) intent.getLongExtra("id", -1) + REQUEST_ATTACHMENT_OFFSET);
|
startActivityForResult(create, (int) intent.getLongExtra("id", -1) + REQUEST_ATTACHMENT_OFFSET);
|
||||||
|
}
|
||||||
|
|
||||||
} else if (ACTION_ACTIVATE_PRO.equals(intent.getAction())) {
|
private void onActivatePro(Intent intent) {
|
||||||
try {
|
try {
|
||||||
Uri data = intent.getParcelableExtra("uri");
|
Uri data = intent.getParcelableExtra("uri");
|
||||||
String challenge = getChallenge();
|
String challenge = getChallenge();
|
||||||
|
@ -721,8 +737,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
|
||||||
Toast.makeText(ActivityView.this, ex.getMessage(), Toast.LENGTH_LONG).show();
|
Toast.makeText(ActivityView.this, ex.getMessage(), Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
|
Loading…
Reference in New Issue