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

Changed setup affinity

This commit is contained in:
M66B 2022-08-25 07:28:06 +02:00
parent 8122efbdb9
commit 5a7365b3ec
14 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/amazon/AndroidManifest.xml
View File

@ -190,13 +190,15 @@
android:name=".ActivitySetup"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivityMain" />
android:parentActivityName=".ActivityMain"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivitySignature"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivitySetup" />
android:parentActivityName=".ActivitySetup"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivityWidget"

6
app/src/fdroid/AndroidManifest.xml
View File

@ -194,13 +194,15 @@
android:name=".ActivitySetup"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivityMain" />
android:parentActivityName=".ActivityMain"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivitySignature"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivitySetup" />
android:parentActivityName=".ActivitySetup"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivityWidget"

6
app/src/github/AndroidManifest.xml
View File

@ -194,13 +194,15 @@
android:name=".ActivitySetup"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivityMain" />
android:parentActivityName=".ActivityMain"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivitySignature"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivitySetup" />
android:parentActivityName=".ActivitySetup"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivityWidget"

6
app/src/main/AndroidManifest.xml
View File

@ -189,13 +189,15 @@
android:name=".ActivitySetup"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivityMain" />
android:parentActivityName=".ActivityMain"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivitySignature"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivitySetup" />
android:parentActivityName=".ActivitySetup"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivityWidget"

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

@ -441,7 +441,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;
}
@ -455,7 +455,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;
}
});
@ -1635,7 +1635,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
Intent manage = new Intent(ActivityView.this, 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 piManage = PendingIntentCompat.getActivity(
ActivityView.this, ActivitySetup.PI_MISC, manage, PendingIntent.FLAG_UPDATE_CURRENT);
@ -1929,7 +1929,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

@ -839,7 +839,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

@ -5108,7 +5108,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

@ -516,7 +516,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"));
}
});

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

@ -87,7 +87,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"));
}
});

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

@ -418,7 +418,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/FragmentDialogTheme.java
View File

@ -242,7 +242,7 @@ public class FragmentDialogTheme extends FragmentDialogBase {
public void onClick(View v) {
dismiss();
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", "display"));
}
});

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

@ -583,7 +583,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

@ -633,7 +633,7 @@ public class FragmentMessages extends FragmentBase
@Override
public void onClick(View v) {
Intent intent = new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
v.getContext().startActivity(intent);
}
});
@ -2109,7 +2109,7 @@ public class FragmentMessages 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"));
}
});
@ -4748,7 +4748,7 @@ public class FragmentMessages 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));
}
});
snackbar.show();
@ -6248,7 +6248,7 @@ public class FragmentMessages 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"));
}
});

6
app/src/play/AndroidManifest.xml
View File

@ -190,13 +190,15 @@
android:name=".ActivitySetup"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivityMain" />
android:parentActivityName=".ActivityMain"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivitySignature"
android:exported="false"
android:launchMode="singleTask"
android:parentActivityName=".ActivitySetup" />
android:parentActivityName=".ActivitySetup"
android:taskAffinity="${applicationId}.SETUP" />
<activity
android:name=".ActivityWidget"