diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/BackgroundMessageRetriever.java b/app/src/main/java/org/thoughtcrime/securesms/messages/BackgroundMessageRetriever.java index b043ec1213..8a38579273 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/BackgroundMessageRetriever.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/BackgroundMessageRetriever.java @@ -60,7 +60,7 @@ public class BackgroundMessageRetriever { } synchronized (this) { - try (DelayedNotificationController controller = GenericForegroundService.startForegroundTaskDelayed(context, context.getString(R.string.BackgroundMessageRetriever_checking_for_messages), showNotificationAfterMs)) { + try (DelayedNotificationController controller = GenericForegroundService.startForegroundTaskDelayed(context, context.getString(R.string.BackgroundMessageRetriever_checking_for_messages), showNotificationAfterMs, R.drawable.ic_signal_refresh)) { PowerManager.WakeLock wakeLock = null; try { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java index 08f4d88985..1d9b1252c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java @@ -126,8 +126,8 @@ public final class GenericForegroundService extends Service { *

* The delayed notification controller can also shown on demand and promoted to a regular notification controller to update the message etc. */ - public static DelayedNotificationController startForegroundTaskDelayed(@NonNull Context context, @NonNull String task, long delayMillis) { - return DelayedNotificationController.create(delayMillis, () -> startForegroundTask(context, task)); + public static DelayedNotificationController startForegroundTaskDelayed(@NonNull Context context, @NonNull String task, long delayMillis, @DrawableRes int iconRes) { + return DelayedNotificationController.create(delayMillis, () -> startForegroundTask(context, task, DEFAULTS.channelId, iconRes)); } public static NotificationController startForegroundTask(@NonNull Context context, @NonNull String task) { diff --git a/app/src/main/res/drawable-hdpi/ic_signal_background_connection.png b/app/src/main/res/drawable-hdpi/ic_signal_background_connection.png new file mode 100644 index 0000000000..d69c1b8121 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_signal_background_connection.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-hdpi/ic_signal_background_connection.webp deleted file mode 100644 index 4f54a250d1..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_signal_background_connection.webp and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_signal_backup.png b/app/src/main/res/drawable-hdpi/ic_signal_backup.png new file mode 100644 index 0000000000..c826e7cc11 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_signal_backup.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_signal_backup.webp b/app/src/main/res/drawable-hdpi/ic_signal_backup.webp deleted file mode 100644 index 4bd21477f8..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_signal_backup.webp and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_signal_refresh.png b/app/src/main/res/drawable-hdpi/ic_signal_refresh.png new file mode 100644 index 0000000000..fc31891b9c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_signal_refresh.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_signal_background_connection.png b/app/src/main/res/drawable-mdpi/ic_signal_background_connection.png new file mode 100644 index 0000000000..782c553b39 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_signal_background_connection.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-mdpi/ic_signal_background_connection.webp deleted file mode 100644 index 826038dcdb..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_signal_background_connection.webp and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_signal_backup.png b/app/src/main/res/drawable-mdpi/ic_signal_backup.png new file mode 100644 index 0000000000..e869aea4ad Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_signal_backup.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_signal_backup.webp b/app/src/main/res/drawable-mdpi/ic_signal_backup.webp deleted file mode 100644 index cb8cfb5fc4..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_signal_backup.webp and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_signal_refresh.png b/app/src/main/res/drawable-mdpi/ic_signal_refresh.png new file mode 100644 index 0000000000..be24690352 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_signal_refresh.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_background_connection.png b/app/src/main/res/drawable-xhdpi/ic_signal_background_connection.png new file mode 100644 index 0000000000..f401c44045 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_signal_background_connection.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-xhdpi/ic_signal_background_connection.webp deleted file mode 100644 index 6f27352f8a..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_signal_background_connection.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_backup.png b/app/src/main/res/drawable-xhdpi/ic_signal_backup.png new file mode 100644 index 0000000000..4e09129c43 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_signal_backup.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_backup.webp b/app/src/main/res/drawable-xhdpi/ic_signal_backup.webp deleted file mode 100644 index 89b1256549..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_signal_backup.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_refresh.png b/app/src/main/res/drawable-xhdpi/ic_signal_refresh.png new file mode 100644 index 0000000000..a2b7f430a5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_signal_refresh.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.png b/app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.png new file mode 100644 index 0000000000..7f137ca862 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.webp deleted file mode 100644 index 098fb5ac63..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_signal_background_connection.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_backup.png b/app/src/main/res/drawable-xxhdpi/ic_signal_backup.png new file mode 100644 index 0000000000..56ac7536fc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_signal_backup.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_backup.webp b/app/src/main/res/drawable-xxhdpi/ic_signal_backup.webp deleted file mode 100644 index 12e25e707d..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_signal_backup.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_signal_refresh.png new file mode 100644 index 0000000000..e3e7f49683 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_signal_refresh.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.png b/app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.png new file mode 100644 index 0000000000..3195d633ca Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.webp b/app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.webp deleted file mode 100644 index 104aad5d2e..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_signal_backup.png b/app/src/main/res/drawable-xxxhdpi/ic_signal_backup.png new file mode 100644 index 0000000000..34997b9661 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_signal_backup.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_signal_backup.webp b/app/src/main/res/drawable-xxxhdpi/ic_signal_backup.webp deleted file mode 100644 index 1185ff8522..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_signal_backup.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_signal_refresh.png b/app/src/main/res/drawable-xxxhdpi/ic_signal_refresh.png new file mode 100644 index 0000000000..529794f593 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_signal_refresh.png differ