Merge pull request #672 from Microsoft/fix/notification-big-text

Fix notification message being truncated
microsoft · May 9, 2018 · 0130659 · 0130659
2 parents 832039c + fe97679
commit 0130659
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/sdk/appcenter-push/src/main/java/com/microsoft/appcenter/push/PushNotifier.java b/sdk/appcenter-push/src/main/java/com/microsoft/appcenter/push/PushNotifier.java
@@ -126,6 +126,9 @@ static void handleNotification(Context context, Intent pushIntent) throws Runtim
         builder.setContentTitle(notificationTitle).
                 setContentText(notificationMessage).
                 setWhen(System.currentTimeMillis());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            builder.setStyle(new Notification.BigTextStyle().bigText(notificationMessage));
+        }
 
         /* Click action. Reuse notification id for simplicity. */
         PendingIntent contentIntent = PendingIntent.getActivity(context, notificationId,

diff --git a/sdk/appcenter-push/src/test/java/com/microsoft/appcenter/push/PushNotifierTest.java b/sdk/appcenter-push/src/test/java/com/microsoft/appcenter/push/PushNotifierTest.java
@@ -23,6 +23,7 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -102,6 +103,9 @@ public void setUp() throws Exception {
         when(mNotificationBuilderMock.setWhen(anyLong())).thenReturn(mNotificationBuilderMock);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             when(mNotificationBuilderMock.build()).thenReturn(mNotificationMock);
+            Notification.BigTextStyle bigTextStyle = mock(Notification.BigTextStyle.class);
+            whenNew(Notification.BigTextStyle.class).withAnyArguments().thenReturn(bigTextStyle);
+            when(bigTextStyle.bigText(any(CharSequence.class))).thenReturn(bigTextStyle);
         }
         when(mNotificationBuilderMock.getNotification()).thenReturn(mNotificationMock);
         whenNew(Notification.Builder.class).withArguments(mContextMock).thenReturn(mNotificationBuilderMock);
@@ -152,6 +156,11 @@ public void handlePushJellybean() throws Exception {
         verify(mNotificationManagerMock).notify(anyInt(), any(Notification.class));
         verifyStatic();
         PushIntentUtils.setMessageId(eq(mDummyGoogleMessageId), same(mActionIntentMock));
+
+        /* Verify we apply big text style on Android 4.1+. */
+        ArgumentCaptor<Notification.BigTextStyle> styleArgumentCaptor = ArgumentCaptor.forClass(Notification.BigTextStyle.class);
+        verify(mNotificationBuilderMock).setStyle(styleArgumentCaptor.capture());
+        verify(styleArgumentCaptor.getValue()).bigText("message");
     }
 
     @Test