empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix some UI issues with view-once photo receive.

Browse source
This commit is contained in:
Greyson Parrelli 2019-07-24 18:47:53 -04:00
parent e0137706b2
commit df9186827c
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View file

@ -1331,7 +1331,7 @@ public class MmsDatabase extends MessagingDatabase {
long revealStartTime = cursor.getLong(cursor.getColumnIndexOrThrow(REVEAL_START_TIME)); long revealStartTime = cursor.getLong(cursor.getColumnIndexOrThrow(REVEAL_START_TIME));
long dateReceived = cursor.getLong(cursor.getColumnIndexOrThrow(DATE_RECEIVED)); long dateReceived = cursor.getLong(cursor.getColumnIndexOrThrow(DATE_RECEIVED));
long expiresAt = revealStartTime > 0 ? revealStartTime + revealDuration long expiresAt = revealStartTime > 0 ? revealStartTime + revealDuration
: dateReceived + RevealableUtil.MAX_LIFESPAN; : dateReceived + RevealableUtil.MAX_LIFESPAN;
if (info == null || expiresAt < nearestExpiration) { if (info == null || expiresAt < nearestExpiration) {
info = new RevealExpirationInfo(id, dateReceived, revealStartTime, revealDuration); info = new RevealExpirationInfo(id, dateReceived, revealStartTime, revealDuration);

1
src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View file

@ -467,7 +467,6 @@ public class MessageNotifier {
slideDeck = ((MmsMessageRecord) record).getSlideDeck(); slideDeck = ((MmsMessageRecord) record).getSlideDeck();
} else if (record.isMms() && ((MmsMessageRecord) record).getRevealDuration() > 0) { } else if (record.isMms() && ((MmsMessageRecord) record).getRevealDuration() > 0) {
body = SpanUtil.italic(context.getString(R.string.MessageNotifier_disappearing_photo)); body = SpanUtil.italic(context.getString(R.string.MessageNotifier_disappearing_photo));
slideDeck = ((MmsMessageRecord) record).getSlideDeck();
} else if (record.isMms() && TextUtils.isEmpty(body) && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) { } else if (record.isMms() && TextUtils.isEmpty(body) && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) {
body = SpanUtil.italic(context.getString(R.string.MessageNotifier_media_message)); body = SpanUtil.italic(context.getString(R.string.MessageNotifier_media_message));
slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck(); slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck();

5
src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
View file

@ -61,7 +61,10 @@ public class RevealableMessageManager extends TimedEventManager<RevealExpiration
@Override @Override
protected long getDelayForEvent(@NonNull RevealExpirationInfo event) { protected long getDelayForEvent(@NonNull RevealExpirationInfo event) {
if (event.getRevealStartTime() == 0) { if (event.getRevealStartTime() == 0) {
return event.getReceiveTime() + RevealableUtil.MAX_LIFESPAN; long expiresAt = event.getReceiveTime() + RevealableUtil.MAX_LIFESPAN;
long timeLeft = expiresAt - System.currentTimeMillis();
return Math.max(0, timeLeft);
} else { } else {
long timeSinceStart = System.currentTimeMillis() - event.getRevealStartTime(); long timeSinceStart = System.currentTimeMillis() - event.getRevealStartTime();
long timeLeft = event.getRevealDuration() - timeSinceStart; long timeLeft = event.getRevealDuration() - timeSinceStart;