Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49d070c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix potential NPE when MessagingMessage's message is null"

parents 30eb7379 f287bdae

core/java/com/android/internal/widget/ConversationLayout.java

+4 −2
Original line number Diff line number Diff line
@@ -927,7 +927,8 @@ public class ConversationLayout extends FrameLayout 
                message = messages.get(i - histSize);

            }

            boolean isNewGroup = currentGroup == null;

            Person sender = message.getMessage().getSenderPerson();

            Person sender =

                    message.getMessage() == null ? null : message.getMessage().getSenderPerson();

            CharSequence key = getKey(sender);

            isNewGroup |= !TextUtils.equals(key, currentSenderKey);

            if (isNewGroup) {
@@ -1190,7 +1191,8 @@ public class ConversationLayout extends FrameLayout 
            return null;

        }

        final MessagingMessage messagingMessage = mMessages.get(mMessages.size() - 1);

        final CharSequence text = messagingMessage.getMessage().getText();

        final CharSequence text = messagingMessage.getMessage() == null ? null

                : messagingMessage.getMessage().getText();

        if (text == null && messagingMessage instanceof MessagingImageMessage) {

            final String unformatted =

                    getResources().getString(R.string.conversation_single_line_image_placeholder);

core/java/com/android/internal/widget/MessagingGroup.java

+3 −1
Original line number Diff line number Diff line
@@ -492,7 +492,9 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou 
            int color = mSendingSpinnerContainer.getVisibility() == View.VISIBLE

                    ? mSendingTextColor : mTextColor;

            for (MessagingMessage message : mMessages) {

                message.setColor(message.getMessage().isRemoteInputHistory() ? color : mTextColor);

                final boolean isRemoteInputHistory =

                        message.getMessage() != null && message.getMessage().isRemoteInputHistory();

                message.setColor(isRemoteInputHistory ? color : mTextColor);

            }

        }

    }

core/java/com/android/internal/widget/MessagingLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -470,7 +470,8 @@ public class MessagingLayout extends FrameLayout 
                message = messages.get(i - histSize);

            }

            boolean isNewGroup = currentGroup == null;

            Person sender = message.getMessage().getSenderPerson();

            Person sender =

                    message.getMessage() == null ? null : message.getMessage().getSenderPerson();

            CharSequence key = sender == null ? null

                    : sender.getKey() == null ? sender.getName() : sender.getKey();

            isNewGroup |= !TextUtils.equals(key, currentSenderKey);