From 002b81a971280756c6daec48b403b8ec97ed8661 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 22 May 2021 16:54:17 +0200 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/ActivityView.java | 20 +++++++++---------- app/src/main/java/eu/faircode/email/Core.java | 6 +++--- .../faircode/email/ServicePowerControl.java | 2 +- .../java/eu/faircode/email/ServiceSend.java | 2 +- .../eu/faircode/email/ServiceSynchronize.java | 4 ++-- .../main/java/eu/faircode/email/Widget.java | 2 +- .../java/eu/faircode/email/WidgetUnified.java | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index b9ab0d8e8f..e30836cdba 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -119,15 +119,15 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB private int lastBackStackCount = 0; private Snackbar lastSnackbar = null; - static final int REQUEST_UNIFIED = 1; - static final int REQUEST_WHY = 2; - static final int REQUEST_ALERT = 3; - static final int REQUEST_THREAD = 4; - static final int REQUEST_OUTBOX = 5; - static final int REQUEST_ERROR = 6; - static final int REQUEST_UPDATE = 7; - static final int REQUEST_WIDGET = 8; - static final int REQUEST_POWER = 9; + static final int PI_UNIFIED = 1; + static final int PI_WHY = 2; + static final int PI_ALERT = 3; + static final int PI_THREAD = 4; + static final int PI_OUTBOX = 5; + static final int PI_ERROR = 6; + static final int PI_UPDATE = 7; + static final int PI_WIDGET = 8; + static final int PI_POWER = 9; static final String ACTION_VIEW_FOLDERS = BuildConfig.APPLICATION_ID + ".VIEW_FOLDERS"; static final String ACTION_VIEW_MESSAGES = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGES"; @@ -1042,7 +1042,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB Intent update = new Intent(Intent.ACTION_VIEW, Uri.parse(info.html_url)) .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent piUpdate = PendingIntentCompat.getActivity( - ActivityView.this, REQUEST_UPDATE, update, PendingIntent.FLAG_UPDATE_CURRENT); + ActivityView.this, PI_UPDATE, update, PendingIntent.FLAG_UPDATE_CURRENT); builder.setContentIntent(piUpdate); Intent manage = new Intent(ActivityView.this, ActivitySetup.class) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index d540e220c7..66fc4e9ddb 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -4167,7 +4167,7 @@ class Core { .setAction("unified" + (notify_remove ? ":" + group : "")); content.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); PendingIntent piContent = PendingIntentCompat.getActivity( - context, ActivityView.REQUEST_UNIFIED, content, PendingIntent.FLAG_UPDATE_CURRENT); + context, ActivityView.PI_UNIFIED, content, PendingIntent.FLAG_UPDATE_CURRENT); Intent clear = new Intent(context, ServiceUI.class).setAction("clear:" + group); PendingIntent piClear = PendingIntentCompat.getService( @@ -4291,7 +4291,7 @@ class Core { thread.putExtra("thread", message.thread); thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(message.folderType)); piContent = PendingIntentCompat.getActivity( - context, ActivityView.REQUEST_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT); + context, ActivityView.PI_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT); } Intent ignore = new Intent(context, ServiceUI.class).setAction("ignore:" + message.id); @@ -4721,7 +4721,7 @@ class Core { intent.setAction("error"); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent pi = PendingIntentCompat.getActivity( - context, ActivityView.REQUEST_ERROR, intent, PendingIntent.FLAG_UPDATE_CURRENT); + context, ActivityView.PI_ERROR, intent, PendingIntent.FLAG_UPDATE_CURRENT); // Build notification NotificationCompat.Builder builder = diff --git a/app/src/main/java/eu/faircode/email/ServicePowerControl.java b/app/src/main/java/eu/faircode/email/ServicePowerControl.java index e854354cd1..3be901e263 100644 --- a/app/src/main/java/eu/faircode/email/ServicePowerControl.java +++ b/app/src/main/java/eu/faircode/email/ServicePowerControl.java @@ -135,7 +135,7 @@ public class ServicePowerControl extends ControlsProviderService { Context context = getBaseContext(); return PendingIntentCompat.getActivity( context, - ActivityView.REQUEST_POWER, + ActivityView.PI_POWER, new Intent(context, ActivitySetup.class) .setAction("misc") .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java index 83875ab07e..32e6b0a734 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSend.java +++ b/app/src/main/java/eu/faircode/email/ServiceSend.java @@ -255,7 +255,7 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar intent.setAction("outbox"); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); return PendingIntentCompat.getActivity( - context, ActivityView.REQUEST_OUTBOX, intent, PendingIntent.FLAG_UPDATE_CURRENT); + context, ActivityView.PI_OUTBOX, intent, PendingIntent.FLAG_UPDATE_CURRENT); } ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() { diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index f7fea9b5f1..54ce4c2f1e 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1097,7 +1097,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences why.setAction("why"); why.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent piWhy = PendingIntentCompat.getActivity( - this, ActivityView.REQUEST_WHY, why, PendingIntent.FLAG_UPDATE_CURRENT); + this, ActivityView.PI_WHY, why, PendingIntent.FLAG_UPDATE_CURRENT); // Build notification NotificationCompat.Builder builder = @@ -1134,7 +1134,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences alert.setAction("alert"); alert.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent piAlert = PendingIntentCompat.getActivity( - this, ActivityView.REQUEST_ALERT, alert, PendingIntent.FLAG_UPDATE_CURRENT); + this, ActivityView.PI_ALERT, alert, PendingIntent.FLAG_UPDATE_CURRENT); // Build notification NotificationCompat.Builder builder = diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java index 8be07ab493..4dfbe844fa 100644 --- a/app/src/main/java/eu/faircode/email/Widget.java +++ b/app/src/main/java/eu/faircode/email/Widget.java @@ -85,7 +85,7 @@ public class Widget extends AppWidgetProvider { view.putExtra("version", version); view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); pi = PendingIntentCompat.getActivity( - context, ActivityView.REQUEST_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT); + context, ActivityView.PI_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT); } else { Intent view = new Intent(context, ActivityView.class); view.setAction("folders:" + account); diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java index 355afb7030..904588c022 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java @@ -91,7 +91,7 @@ public class WidgetUnified extends AppWidgetProvider { thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(type)); thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent piItem = PendingIntent.getActivity( - context, ActivityView.REQUEST_WIDGET, thread, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntentCompat.FLAG_MUTABLE); + context, ActivityView.PI_WIDGET, thread, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntentCompat.FLAG_MUTABLE); views.setPendingIntentTemplate(R.id.lv, piItem);