Skip to content

Commit ed6eeab

Browse files
author
hakonbo
committed
Merge branch 'rel/2.19.x'
2 parents 0b2ad49 + 3f3a0c6 commit ed6eeab

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/src/main/java/com/waz/zclient/pages/main/conversation/views/row/footer/FooterViewController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private void updateMessageStatusLabel() {
232232
Instant messageTime = message.isEdited() || message.isDeleted() ?
233233
message.getEditTime() :
234234
message.getTime();
235-
String timestamp = ZTimeFormatter.getSingleMessageTime(getView().getContext(), DateTimeUtils.toDate(messageTime));
235+
String timestamp = messageTime == null ? "" : ZTimeFormatter.getSingleMessageTime(getView().getContext(), DateTimeUtils.toDate(messageTime));
236236
String status;
237237
Runnable linkRunnable = null;
238238
boolean linkUnderlined = true;

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ext {
7676
zMessagingDevVersionBase = '81.1247'
7777
zMessagingDevVersion = "${zMessagingDevVersionBase}@aar"
7878
// Release version number must be like this X.0(.Y)
79-
zMessagingReleaseVersion = System.getenv("ZMESSAGING_VERSION") ?: '81.3.302@aar'
79+
zMessagingReleaseVersion = System.getenv("ZMESSAGING_VERSION") ?: '82.0.303@aar'
8080

8181
avsVersion = '2.8.65@aar'
8282
avsInternalVersion = avsVersion //leave this here in case we want to test specific AVS versions on internal

0 commit comments

Comments
 (0)