TeamPGM/Nagram
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try fix NPE in ChatMessageCell

Browse Source
This commit is contained in:
xtaodada 2022-10-14 17:14:24 +08:00
parent cec3bdcf15
commit cf31615891
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
View File

@ -12225,7 +12225,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
if (hasPsaHint) { if (hasPsaHint) {
int x; int x;
if (currentPosition == null || (currentPosition.flags & MessageObject.POSITION_FLAG_RIGHT) != 0) { if (currentPosition == null || (currentPosition.flags & MessageObject.POSITION_FLAG_RIGHT) != 0) {
x = currentBackgroundDrawable.getBounds().right; x = getCurrentBackgroundRight();
} else { } else {
x = 0; x = 0;
int dWidth = getGroupPhotosWidth(); int dWidth = getGroupPhotosWidth();
@ -15123,7 +15123,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
drawable.setAlpha(255); drawable.setAlpha(255);
} }
if (docTitleOffsetX < 0 || docTitleOffsetX == 0 && docTitleLayout.getLineLeft(0) == 0) { if (docTitleOffsetX < 0 || docTitleOffsetX == 0 && docTitleLayout.getLineLeft(0) == 0) {
pollHintX = currentBackgroundDrawable.getBounds().right - drawable.getIntrinsicWidth() - AndroidUtilities.dp(currentMessageObject.isOutOwner() ? 17 : 11); pollHintX = getCurrentBackgroundRight() - drawable.getIntrinsicWidth() - AndroidUtilities.dp(currentMessageObject.isOutOwner() ? 17 : 11);
} else { } else {
pollHintX = getCurrentBackgroundLeft() + AndroidUtilities.dp(11); pollHintX = getCurrentBackgroundLeft() + AndroidUtilities.dp(11);
} }
@ -15185,7 +15185,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
} }
delegate.needReloadPolls(); delegate.needReloadPolls();
} }
int tx = currentBackgroundDrawable.getBounds().right - closeTimeWidth - AndroidUtilities.dp(currentMessageObject.isOutOwner() ? 40 : 34); int tx = getCurrentBackgroundRight() - closeTimeWidth - AndroidUtilities.dp(currentMessageObject.isOutOwner() ? 40 : 34);
if (time <= 5000) { if (time <= 5000) {
Theme.chat_timePaint.setColor(getThemedColor(currentMessageObject.isOutOwner() ? Theme.key_chat_outPollWrongAnswer : Theme.key_chat_inPollWrongAnswer)); Theme.chat_timePaint.setColor(getThemedColor(currentMessageObject.isOutOwner() ? Theme.key_chat_outPollWrongAnswer : Theme.key_chat_inPollWrongAnswer));
} }
@ -16724,6 +16724,10 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
return left; return left;
} }
public int getCurrentBackgroundRight() {
return currentBackgroundDrawable == null ? 0 : currentBackgroundDrawable.getBounds().right;
}
public TransitionParams getTransitionParams() { public TransitionParams getTransitionParams() {
return transitionParams; return transitionParams;
} }
@ -16975,7 +16979,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
lastForwardedNamesOffset = namesOffset; lastForwardedNamesOffset = namesOffset;
lastForwardNameWidth = forwardedNameWidth; lastForwardNameWidth = forwardedNameWidth;
lastBackgroundLeft = getCurrentBackgroundLeft(); lastBackgroundLeft = getCurrentBackgroundLeft();
lastBackgroundRight = currentBackgroundDrawable.getBounds().right; lastBackgroundRight = getCurrentBackgroundRight();
reactionsLayoutInBubble.recordDrawingState(); reactionsLayoutInBubble.recordDrawingState();
if (replyNameLayout != null) { if (replyNameLayout != null) {