msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Start setup in new task always

Browse Source
pull/203/head
M66B 4 years ago
parent c846d390cc
commit e47281b533
13 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File

9
app/src/main/java/eu/faircode/email/ActivityError.java
Unescape View File

@ -59,11 +59,10 @@ public class ActivityError extends ActivityBase {
ibSetting.setVisibility(account < 0 ? View.GONE : View.VISIBLE); ibSetting.setVisibility(account < 0 ? View.GONE : View.VISIBLE);
ibSetting.setOnClickListener(new View.OnClickListener() { ibSetting.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
Intent intent = new Intent(view.getContext(), ActivitySetup.class) v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.setAction("target:accounts") .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("target", "accounts"); .putExtra("target", "accounts"));
startActivity(intent);
} }
}); });

3
app/src/main/java/eu/faircode/email/ActivityMain.java
Unescape View File

@ -176,7 +176,8 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
} }
}, SERVICE_START_DELAY); }, SERVICE_START_DELAY);
} else } else
startActivity(new Intent(ActivityMain.this, ActivitySetup.class)); startActivity(new Intent(ActivityMain.this, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
long end = new Date().getTime(); long end = new Date().getTime();
Log.i("Main booted " + (end - start) + " ms"); Log.i("Main booted " + (end - start) + " ms");

5
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -365,7 +365,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
String tab = FragmentOptions.TAB_LABELS.get(item.getOrder()); String tab = FragmentOptions.TAB_LABELS.get(item.getOrder());
startActivity(new Intent(ActivityView.this, ActivitySetup.class) startActivity(new Intent(ActivityView.this, ActivitySetup.class)
.setAction(tab) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", tab)); .putExtra("tab", tab));
return true; return true;
} }
@ -1543,7 +1543,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
} }
private void onMenuSetup() { private void onMenuSetup() {
startActivity(new Intent(ActivityView.this, ActivitySetup.class)); startActivity(new Intent(ActivityView.this, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
private void onMenuLegend() { private void onMenuLegend() {

8
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

@ -757,10 +757,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
context.startActivity( v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
new Intent(context, ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
}); });
snackbar.show(); snackbar.show();

8
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -4197,11 +4197,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.setNeutralButton(R.string.title_setup, new DialogInterface.OnClickListener() { .setNeutralButton(R.string.title_setup, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Intent privacy = new Intent(context, ActivitySetup.class) context.startActivity(new Intent(context, ActivitySetup.class)
.setAction("privacy") .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .putExtra("tab", "privacy"));
.putExtra("tab", "privacy");
context.startActivity(privacy);
} }
}) })
.create(); .create();

8
app/src/main/java/eu/faircode/email/FragmentAccounts.java
Unescape View File

@ -414,10 +414,10 @@ public class FragmentAccounts extends FragmentBase {
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
startActivity( v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
new Intent(getContext(), ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
}); });
snackbar.show(); snackbar.show();

20
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -3483,9 +3483,9 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (ex.getCause() instanceof CertificateException) if (ex.getCause() instanceof CertificateException)
startActivity( v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
new Intent(getContext(), ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "encryption")); .putExtra("tab", "encryption"));
else { else {
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), vwAnchor); PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), vwAnchor);
popupMenu.getMenu().add(Menu.NONE, R.string.title_send_dialog, 1, R.string.title_send_dialog); popupMenu.getMenu().add(Menu.NONE, R.string.title_send_dialog, 1, R.string.title_send_dialog);
@ -3504,9 +3504,9 @@ public class FragmentCompose extends FragmentBase {
fragment.show(getParentFragmentManager(), "compose:send"); fragment.show(getParentFragmentManager(), "compose:send");
return true; return true;
} else if (itemId == R.string.title_advanced_manage_certificates) { } else if (itemId == R.string.title_advanced_manage_certificates) {
startActivity( startActivity(new Intent(getContext(), ActivitySetup.class)
new Intent(getContext(), ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "encryption")); .putExtra("tab", "encryption"));
return true; return true;
} }
return false; return false;
@ -4978,8 +4978,9 @@ public class FragmentCompose extends FragmentBase {
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
startActivity(new Intent(getContext(), ActivitySetup.class)); v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
getActivity().finish(); getActivity().finish();
} }
}); });
@ -6476,7 +6477,8 @@ public class FragmentCompose extends FragmentBase {
btnFixSent.setOnClickListener(new View.OnClickListener() { btnFixSent.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
startActivity(new Intent(v.getContext(), ActivitySetup.class) v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("target", "accounts")); .putExtra("target", "accounts"));
} }
}); });

8
app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
Unescape View File

@ -58,10 +58,10 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
tvOption.setOnClickListener(new View.OnClickListener() { tvOption.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
startActivity( v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
new Intent(getContext(), ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
}); });

6
app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java
Unescape View File

@ -90,7 +90,8 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
prefs.edit().putBoolean("identities_primary_hint", true).apply(); prefs.edit().putBoolean("identities_primary_hint", true).apply();
startActivity(new Intent(v.getContext(), ActivitySetup.class) v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("manual", true)); .putExtra("manual", true));
tvPrimaryHint.setVisibility(View.GONE); tvPrimaryHint.setVisibility(View.GONE);
} }
@ -106,7 +107,8 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
btnFix.setOnClickListener(new View.OnClickListener() { btnFix.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
startActivity(new Intent(getContext(), ActivitySetup.class)); v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
getActivity().finish(); getActivity().finish();
dismiss(); dismiss();
} }

8
app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
Unescape View File

@ -413,11 +413,9 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
btnSettings.setOnClickListener(new View.OnClickListener() { btnSettings.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent privacy = new Intent(v.getContext(), ActivitySetup.class) v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.setAction("privacy") .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .putExtra("tab", "privacy"));
.putExtra("tab", "privacy");
v.getContext().startActivity(privacy);
} }
}); });

14
app/src/main/java/eu/faircode/email/FragmentFolders.java
Unescape View File

@ -253,9 +253,9 @@ public class FragmentFolders extends FragmentBase {
fabError.setOnClickListener(new View.OnClickListener() { fabError.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(v.getContext(), ActivitySetup.class) v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.putExtra("target", "accounts"); .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(intent); .putExtra("target", "accounts"));
} }
}); });
@ -434,10 +434,10 @@ public class FragmentFolders extends FragmentBase {
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
startActivity( v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
new Intent(getContext(), ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
}); });
snackbar.show(); snackbar.show();

27
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -1617,10 +1617,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
startActivity( v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
new Intent(getContext(), ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
}); });
snackbar.show(); snackbar.show();
@ -4115,7 +4115,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
startActivity(new Intent(context, ActivitySetup.class)); v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
}); });
snackbar.show(); snackbar.show();
@ -5001,10 +5002,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
startActivity( v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
new Intent(getContext(), ActivitySetup.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "connection")); .putExtra("tab", "connection"));
} }
}); });
snackbar.show(); snackbar.show();
@ -7713,10 +7714,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
.setGestureInsetBottomIgnored(true); .setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
Intent intent = new Intent(getContext(), ActivitySetup.class) v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.putExtra("target", "accounts"); .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(intent); .putExtra("target", "accounts"));
} }
}); });
snackbar.show(); snackbar.show();

3
app/src/main/java/eu/faircode/email/FragmentPro.java
Unescape View File

@ -98,7 +98,8 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
btnBackup.setOnClickListener(new View.OnClickListener() { btnBackup.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
startActivity(new Intent(getContext(), ActivitySetup.class) v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("navigate", true)); .putExtra("navigate", true));
} }
}); });

Write Preview
Loading…
Cancel
Save