From 5b18f05aa85c75057995ac6858a9db7ebacb1996 Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Fri, 21 Mar 2025 13:04:20 -0400 Subject: [PATCH] Add date to linked device notification. --- .../securesms/jobs/NewLinkedDeviceNotificationJob.kt | 3 ++- .../java/org/thoughtcrime/securesms/megaphone/Megaphones.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/NewLinkedDeviceNotificationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/NewLinkedDeviceNotificationJob.kt index 952efe4750..25fa46a482 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/NewLinkedDeviceNotificationJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/NewLinkedDeviceNotificationJob.kt @@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.notifications.NotificationIds import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.util.DateUtils import org.thoughtcrime.securesms.util.ServiceUtil +import java.util.Locale import kotlin.random.Random import kotlin.time.Duration.Companion.days import kotlin.time.Duration.Companion.minutes @@ -74,7 +75,7 @@ class NewLinkedDeviceNotificationJob private constructor( val builder = NotificationCompat.Builder(context, NotificationChannels.getInstance().NEW_LINKED_DEVICE) .setSmallIcon(R.drawable.ic_notification) .setContentTitle(context.getString(R.string.NewLinkedDeviceNotification__you_linked_new_device)) - .setContentText(context.getString(R.string.NewLinkedDeviceNotification__a_new_device_was_linked, DateUtils.getOnlyTimeAtString(context, data.deviceCreatedAt))) + .setContentText(context.getString(R.string.NewLinkedDeviceNotification__a_new_device_was_linked, DateUtils.getDateTimeString(context, Locale.getDefault(), data.deviceCreatedAt))) .setContentIntent(pendingIntent) ServiceUtil.getNotificationManager(context).notify(NotificationIds.NEW_LINKED_DEVICE, builder.build()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java index edad53d121..a886325cb0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -302,7 +302,7 @@ public final class Megaphones { } private static @NonNull Megaphone buildNewLinkedDeviceMegaphone(@NonNull Context context) { - String createdAt = DateUtils.getOnlyTimeAtString(context, SignalStore.misc().getNewLinkedDeviceCreatedTime()); + String createdAt = DateUtils.getDateTimeString(context, Locale.getDefault(), SignalStore.misc().getNewLinkedDeviceCreatedTime()); return new Megaphone.Builder(Event.NEW_LINKED_DEVICE, Megaphone.Style.BASIC) .setTitle(R.string.NewLinkedDeviceNotification__you_linked_new_device) .setBody(context.getString(R.string.NewLinkedDeviceMegaphone__a_new_device_was_linked, createdAt))