From 21bc23303f1f61d61f3f9ed9d457a4e31bda5935 Mon Sep 17 00:00:00 2001 From: James Hugman Date: Fri, 26 Jan 2024 16:58:20 +0000 Subject: [PATCH] =?UTF-8?q?Bug=201880476=20=E2=80=94=C2=A0Reduce=20visibil?= =?UTF-8?q?ity=20of=20fields=20in=20Message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 4 ++-- .../viewholders/onboarding/MessageCardViewHolder.kt | 6 +++--- .../fenix/messaging/MessageNotificationWorker.kt | 11 +++++------ .../fenix/messaging/state/MessagingMiddleware.kt | 4 ++-- .../fenix/messaging/state/MessagingMiddlewareTest.kt | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index eb59219bef..c649a8dd0d 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -1229,8 +1229,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { val fenixNimbusMessagingController = FenixNimbusMessagingController(messagingStorage) val researchSurfaceDialogFragment = ResearchSurfaceDialogFragment.newInstance( - keyMessageText = nextMessage.data.text, - keyAcceptButtonText = nextMessage.data.buttonLabel, + keyMessageText = nextMessage.text, + keyAcceptButtonText = nextMessage.buttonLabel, keyDismissButtonText = null, ) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt index 7fbe7e145e..85b0d934ee 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt @@ -77,9 +77,9 @@ class MessageCardViewHolder( ) MessageCard( - messageText = message.data.text, - titleText = message.data.title, - buttonText = message.data.buttonLabel, + messageText = message.text, + titleText = message.title, + buttonText = message.buttonLabel, messageColors = messageCardColors, onClick = { interactor.onMessageClicked(message) }, onCloseButtonClick = { interactor.onMessageClosedClicked(message) }, diff --git a/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt b/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt index 7211e0047f..6a8bd3ba7f 100644 --- a/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt +++ b/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt @@ -52,9 +52,8 @@ class MessageNotificationWorker( ?: return Result.success() val currentBootUniqueIdentifier = BootUtils.getBootIdentifier(context) - val messageMetadata = nextMessage.metadata // Device has NOT been power cycled. - if (messageMetadata.latestBootIdentifier == currentBootUniqueIdentifier) { + if (nextMessage.hasShownThisCycle(currentBootUniqueIdentifier)) { return Result.success() } @@ -91,8 +90,8 @@ class MessageNotificationWorker( return createBaseNotification( context, ensureMarketingChannelExists(context), - message.data.title, - message.data.text, + message.title, + message.text, onClickPendingIntent, onDismissPendingIntent, ) @@ -189,7 +188,7 @@ class NotificationDismissedService : LifecycleService() { if (message != null) { // Update message as 'dismissed'. - nimbusMessagingController.onMessageDismissed(message.metadata) + nimbusMessagingController.onMessageDismissed(message) } } } @@ -220,7 +219,7 @@ class NotificationClickedReceiverActivity : ComponentActivity() { if (message != null) { // Update message as 'clicked'. - nimbusMessagingController.onMessageClicked(message.metadata) + nimbusMessagingController.onMessageClicked(message) // Create the intent. val intent = nimbusMessagingController.getIntentForMessage(message) diff --git a/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt b/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt index 9388f34148..4d8f79ad9c 100644 --- a/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt @@ -93,7 +93,7 @@ class MessagingMiddleware( context.dispatch(UpdateMessages(newMessages)) consumeMessageToShowIfNeeded(context, message) coroutineScope.launch { - controller.onMessageDismissed(message.metadata) + controller.onMessageDismissed(message) } } @@ -103,7 +103,7 @@ class MessagingMiddleware( ) { // Update Nimbus storage. coroutineScope.launch { - controller.onMessageClicked(message.metadata) + controller.onMessageClicked(message) } // Update app state. val newMessages = removeMessage(context, message) diff --git a/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt index d550019148..9dd968590f 100644 --- a/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt @@ -221,7 +221,7 @@ class MessagingMiddlewareTest { store.dispatch(Evaluate(FenixMessageSurfaceId.HOMESCREEN)) store.waitUntilIdle() - assertEquals(1, store.state.messaging.messages.first().metadata.displayCount) + assertEquals(1, store.state.messaging.messages.first().displayCount) } @Test @@ -286,7 +286,7 @@ class MessagingMiddlewareTest { store.dispatch(Evaluate(FenixMessageSurfaceId.HOMESCREEN)).joinBlocking() store.waitUntilIdle() - assertEquals(messageDisplayed.metadata.displayCount, store.state.messaging.messages[0].metadata.displayCount) + assertEquals(messageDisplayed.displayCount, store.state.messaging.messages[0].displayCount) } @Test