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

Refactoring

This commit is contained in:
M66B 2022-06-25 14:27:46 +02:00
parent 5db35154df
commit eefe74b06d
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
Intent thread = new Intent(ActivityMain.this, ActivityView.class);
thread.setAction("thread:" + message.id);
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account);
thread.putExtra("folder", message.folder);
thread.putExtra("thread", message.thread);

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

@ -1623,14 +1623,14 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
.setVisibility(NotificationCompat.VISIBILITY_SECRET);
Intent update = new Intent(Intent.ACTION_VIEW, Uri.parse(info.html_url))
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent piUpdate = PendingIntentCompat.getActivity(
ActivityView.this, PI_UPDATE, update, PendingIntent.FLAG_UPDATE_CURRENT);
builder.setContentIntent(piUpdate);
Intent manage = new Intent(ActivityView.this, ActivitySetup.class)
.setAction("misc")
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_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);
@ -1642,7 +1642,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (!TextUtils.isEmpty(info.download_url)) {
Intent download = new Intent(Intent.ACTION_VIEW, Uri.parse(info.download_url))
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent piDownload = PendingIntentCompat.getActivity(
ActivityView.this, 0, download, 0);
NotificationCompat.Action.Builder actionDownload = new NotificationCompat.Action.Builder(

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

@ -237,7 +237,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
send.setAction(Intent.ACTION_SEND);
send.putExtra(Intent.EXTRA_STREAM, uri);
send.setType(attachment.getMimeType());
send.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
send.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
context.startActivity(Intent.createChooser(send, context.getString(R.string.title_select_app)));
return true;

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

@ -6388,7 +6388,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
intent.setAction(Intent.ACTION_SEND_MULTIPLE);
intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
}
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
}
}

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

@ -5260,7 +5260,7 @@ class Core {
} else
content = new Intent(context, ActivityView.class)
.setAction("unified" + (notify_remove ? ":" + group : ""));
content.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
content.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
PendingIntent piContent = PendingIntentCompat.getActivity(
context, ActivityView.PI_UNIFIED, content, PendingIntent.FLAG_UPDATE_CURRENT);
@ -5385,7 +5385,7 @@ class Core {
// Build pending intents
Intent thread = new Intent(context, ActivityView.class);
thread.setAction("thread:" + message.id);
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account);
thread.putExtra("folder", message.folder);
thread.putExtra("thread", message.thread);
@ -5857,7 +5857,7 @@ class Core {
intent.putExtra("protocol", account.protocol);
intent.putExtra("auth_type", account.auth_type);
intent.putExtra("faq", 22);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent pi = PendingIntentCompat.getActivity(
context, ActivityError.PI_ERROR, intent, PendingIntent.FLAG_UPDATE_CURRENT);

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

@ -5715,7 +5715,7 @@ public class FragmentCompose extends FragmentBase {
Intent thread = new Intent(v.getContext(), ActivityView.class);
thread.setAction("thread:" + message.id);
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account);
thread.putExtra("folder", message.folder);
thread.putExtra("thread", message.thread);

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

@ -297,7 +297,7 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
send.setPackage(BuildConfig.APPLICATION_ID);
send.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
send.setType("message/rfc822");
send.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
send.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
send.putExtra("fair:account", account);
startActivity(send);

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

@ -383,7 +383,7 @@ public class FragmentFolders extends FragmentBase {
intent.putExtra("protocol", account.protocol);
intent.putExtra("auth_type", account.auth_type);
intent.putExtra("faq", 22);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}

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

@ -617,7 +617,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public void onClick(View v) {
Intent intent = new Intent(android.provider.Settings.ACTION_AIRPLANE_MODE_SETTINGS)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
v.getContext().startActivity(intent);
}
});

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

@ -272,7 +272,7 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
private static PendingIntent getPendingIntent(Context context) {
Intent intent = new Intent(context, ActivityView.class);
intent.setAction("outbox");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return PendingIntentCompat.getActivity(
context, ActivityView.PI_OUTBOX, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}

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

@ -1393,7 +1393,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
// Build pending intent
Intent why = new Intent(this, ActivityView.class);
why.setAction("why");
why.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
why.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent piWhy = PendingIntentCompat.getActivity(
this, ActivityView.PI_WHY, why, PendingIntent.FLAG_UPDATE_CURRENT);
@ -1443,7 +1443,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
intent.putExtra("protocol", account.protocol);
intent.putExtra("auth_type", account.auth_type);
intent.putExtra("faq", 23);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent piAlert = PendingIntentCompat.getActivity(
this, ActivityError.PI_ALERT, intent, PendingIntent.FLAG_UPDATE_CURRENT);

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

@ -280,7 +280,7 @@ class Shortcuts {
static ShortcutInfoCompat.Builder getShortcut(Context context, EntityMessage message, ContactInfo[] contactInfo) {
Intent thread = new Intent(context, ActivityView.class);
thread.setAction("thread:" + message.id);
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.putExtra("account", message.account);
thread.putExtra("folder", message.folder);
thread.putExtra("thread", message.thread);
@ -323,7 +323,7 @@ class Shortcuts {
view.setAction("folder:" + folder.id);
view.putExtra("account", folder.account);
view.putExtra("type", folder.type);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
int resid = EntityFolder.getIcon(folder.type);
Drawable d = context.getDrawable(resid);

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

@ -80,7 +80,7 @@ public class Widget extends AppWidgetProvider {
view.putExtra("type", folders.get(0).type);
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pi = PendingIntentCompat.getActivity(
context, appWidgetId, view, PendingIntent.FLAG_UPDATE_CURRENT);
} else {
@ -89,7 +89,7 @@ public class Widget extends AppWidgetProvider {
view.setAction("unified");
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pi = PendingIntentCompat.getActivity(
context, ActivityView.PI_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT);
} else {
@ -97,7 +97,7 @@ public class Widget extends AppWidgetProvider {
view.setAction("folders:" + account);
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pi = PendingIntentCompat.getActivity(
context, appWidgetId, view, PendingIntent.FLAG_UPDATE_CURRENT);
}

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

@ -73,7 +73,7 @@ public class WidgetUnified extends AppWidgetProvider {
view.putExtra("type", type);
view.putExtra("refresh", true);
view.putExtra("version", version);
view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
PendingIntent pi = PendingIntentCompat.getActivity(
context, appWidgetId, view, PendingIntent.FLAG_UPDATE_CURRENT);
@ -88,7 +88,7 @@ public class WidgetUnified extends AppWidgetProvider {
edit.setAction("widget:" + appWidgetId);
edit.putExtra("action", "new");
edit.putExtra("account", account);
edit.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
edit.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
PendingIntent piCompose = PendingIntentCompat.getActivity(
context, appWidgetId, edit, PendingIntent.FLAG_UPDATE_CURRENT);
@ -126,7 +126,7 @@ public class WidgetUnified extends AppWidgetProvider {
thread.putExtra("widget_folder", folder);
thread.putExtra("widget_type", type);
thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(type));
thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
thread.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent piItem = PendingIntentCompat.getActivity(
context, ActivityView.PI_WIDGET, thread, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);