From 3d5cfb3c746acc837c1057c63a89184d828614cb Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 24 Jul 2019 19:11:04 -0400 Subject: [PATCH] Remove some dead code. --- .../securesms/revealable/RevealableMessageView.java | 12 ------------ .../securesms/revealable/RevealableUtil.java | 11 ----------- 2 files changed, 23 deletions(-) diff --git a/src/org/thoughtcrime/securesms/revealable/RevealableMessageView.java b/src/org/thoughtcrime/securesms/revealable/RevealableMessageView.java index 03c116dbd9..ab339928c2 100644 --- a/src/org/thoughtcrime/securesms/revealable/RevealableMessageView.java +++ b/src/org/thoughtcrime/securesms/revealable/RevealableMessageView.java @@ -33,8 +33,6 @@ public class RevealableMessageView extends LinearLayout { private ImageView icon; private ProgressWheel progress; private TextView text; - private Handler handler; - private Runnable updateRunnable; private Attachment attachment; private int unopenedForegroundColor; private int openedForegroundColor; @@ -66,7 +64,6 @@ public class RevealableMessageView extends LinearLayout { this.icon = findViewById(R.id.revealable_icon); this.progress = findViewById(R.id.revealable_progress); this.text = findViewById(R.id.revealable_text); - this.handler = new Handler(); } @Override @@ -96,7 +93,6 @@ public class RevealableMessageView extends LinearLayout { public void setMessage(@NonNull MmsMessageRecord message) { this.attachment = message.getSlideDeck().getThumbnailSlide() != null ? message.getSlideDeck().getThumbnailSlide().asAttachment() : null; - clearUpdateRunnable(); presentMessage(message); } @@ -135,7 +131,6 @@ public class RevealableMessageView extends LinearLayout { text.setText(R.string.RevealableMessageView_viewed); icon.setImageResource(R.drawable.ic_play_outline_24); progress.setVisibility(GONE); - clearUpdateRunnable(); } text.setTextColor(foregroundColor); @@ -151,13 +146,6 @@ public class RevealableMessageView extends LinearLayout { return attachment.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_STARTED; } - private void clearUpdateRunnable() { - if (updateRunnable != null) { - handler.removeCallbacks(updateRunnable); - updateRunnable = null; - } - } - private @NonNull String formatFileSize(@NonNull MmsMessageRecord messageRecord) { if (messageRecord.getSlideDeck().getThumbnailSlide() == null) return ""; diff --git a/src/org/thoughtcrime/securesms/revealable/RevealableUtil.java b/src/org/thoughtcrime/securesms/revealable/RevealableUtil.java index e1c3f06d43..6ea1955c47 100644 --- a/src/org/thoughtcrime/securesms/revealable/RevealableUtil.java +++ b/src/org/thoughtcrime/securesms/revealable/RevealableUtil.java @@ -47,15 +47,4 @@ public class RevealableUtil { return false; } } - - public static boolean hasStarted(@Nullable MmsMessageRecord record) { - return record != null && record.getRevealStartTime() != 0; - } - - public static boolean hasMedia(@Nullable MmsMessageRecord record) { - return record != null && - record.getSlideDeck().getThumbnailSlide() != null && - record.getSlideDeck().getThumbnailSlide().getUri() != null && - record.getSlideDeck().getThumbnailSlide().getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_DONE; - } }