mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean setup task

This commit is contained in:
M66B 2021-09-27 18:57:39 +02:00
parent efb0098eb7
commit 3a0e57579e
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ public class ActivityError extends ActivityBase {
@Override
protected void onExecuted(Bundle args, Void data) {
startActivity(new Intent(ActivityError.this, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("target", "accounts")
.putExtra("id", account)
.putExtra("protocol", protocol));
@ -134,7 +134,7 @@ public class ActivityError extends ActivityBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("target", "accounts")
.putExtra("id", account)
.putExtra("protocol", protocol));

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

@ -208,7 +208,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
}, SERVICE_START_DELAY);
} else {
Intent setup = new Intent(ActivityMain.this, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(setup, options);
}

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

@ -386,7 +386,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
public boolean onMenuItemClick(MenuItem item) {
String tab = FragmentOptions.TAB_LABELS.get(item.getOrder());
startActivity(new Intent(ActivityView.this, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", tab));
return true;
}
@ -400,7 +400,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override
public boolean onLongClick(View view) {
startActivity(new Intent(ActivityView.this, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
return true;
}
});
@ -1395,7 +1395,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
Intent manage = new Intent(ActivityView.this, ActivitySetup.class)
.setAction("misc")
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "misc");
PendingIntent piManage = PendingIntentCompat.getActivity(
ActivityView.this, ActivitySetup.PI_MISC, manage, PendingIntent.FLAG_UPDATE_CURRENT);
@ -1635,7 +1635,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void onMenuSetup() {
startActivity(new Intent(ActivityView.this, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
}
private void onMenuLegend() {

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

@ -769,7 +769,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "connection"));
}
});

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

@ -4274,7 +4274,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
public void onClick(DialogInterface dialog, int which) {
context.startActivity(new Intent(context, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "privacy"));
}
})

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

@ -416,7 +416,7 @@ public class FragmentAccounts extends FragmentBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "connection"));
}
});

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

@ -3675,7 +3675,7 @@ public class FragmentCompose extends FragmentBase {
public void onClick(View v) {
if (ex.getCause() instanceof CertificateException)
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "encryption"));
else {
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), vwAnchor);
@ -3696,7 +3696,7 @@ public class FragmentCompose extends FragmentBase {
return true;
} else if (itemId == R.string.title_advanced_manage_certificates) {
startActivity(new Intent(getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "encryption"));
return true;
}
@ -5191,7 +5191,7 @@ public class FragmentCompose extends FragmentBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
getActivity().finish();
}
});
@ -6716,7 +6716,7 @@ public class FragmentCompose extends FragmentBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("target", "accounts"));
}
});

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

@ -66,7 +66,7 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "connection"));
}
});

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

@ -91,7 +91,7 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
public void onClick(View v) {
prefs.edit().putBoolean("identities_primary_hint", true).apply();
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("manual", true));
tvPrimaryHint.setVisibility(View.GONE);
}
@ -108,7 +108,7 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
getActivity().finish();
dismiss();
}

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

@ -364,7 +364,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "privacy"));
}
});

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

@ -484,7 +484,7 @@ public class FragmentFolders extends FragmentBase {
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "connection"));
}
});

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

@ -1689,7 +1689,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "connection"));
}
});
@ -4215,7 +4215,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
}
});
snackbar.show();
@ -5206,7 +5206,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "connection"));
}
});
@ -7982,7 +7982,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onClick(View v) {
v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("target", "accounts"));
}
});

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

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

2
app/src/main/java/eu/faircode/email/ServicePowerControl.java
View File

@ -138,7 +138,7 @@ public class ServicePowerControl extends ControlsProviderService {
ActivityView.PI_POWER,
new Intent(context, ActivitySetup.class)
.setAction("misc")
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra("tab", "misc"),
PendingIntent.FLAG_UPDATE_CURRENT);
}