From 631f77425b7c6ca1a02b4903c92ec1a0eba3415e Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 25 Feb 2021 10:30:56 +1100
Subject: [PATCH] Minor refactoring

---
 .../loki/api/PrepareAttachmentAudioExtrasJob.kt    |  2 +-
 .../securesms/loki/protocol/SessionMetaProtocol.kt | 14 --------------
 .../loki/utilities/{audio => }/DecodedAudio.kt     |  2 +-
 .../securesms/loki/views/WaveformSeekBar.kt        |  2 +-
 4 files changed, 3 insertions(+), 17 deletions(-)
 rename app/src/main/java/org/thoughtcrime/securesms/loki/utilities/{audio => }/DecodedAudio.kt (99%)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
index 054c4ee11c..c659146caf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
@@ -12,7 +12,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.BaseJob
-import org.thoughtcrime.securesms.loki.utilities.audio.DecodedAudio
+import org.thoughtcrime.securesms.loki.utilities.DecodedAudio
 import org.thoughtcrime.securesms.mms.PartAuthority
 import java.io.InputStream
 import java.lang.IllegalStateException
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
index 69b9635006..ded1b933c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
@@ -16,11 +16,6 @@ object SessionMetaProtocol {
 
     private val timestamps = mutableSetOf<Long>()
 
-    @JvmStatic
-    fun dropFromTimestampCacheIfNeeded(timestamp: Long) {
-        timestamps.remove(timestamp)
-    }
-
     fun getTimestamps(): Set<Long> {
         return timestamps
     }
@@ -73,9 +68,6 @@ object SessionMetaProtocol {
         }
     }
 
-    /**
-     * Should be invoked for the recipient's master device.
-     */
     @JvmStatic
     fun canUserReplyToNotification(recipient: Recipient): Boolean {
         // TODO return !recipient.address.isRSSFeed
@@ -91,17 +83,11 @@ object SessionMetaProtocol {
         return hasBody || hasAttachment || hasLinkPreview
     }
 
-    /**
-     * Should be invoked for the recipient's master device.
-     */
     @JvmStatic
     fun shouldSendReadReceipt(address: Address): Boolean {
         return !address.isGroup
     }
 
-    /**
-     * Should be invoked for the recipient's master device.
-     */
     @JvmStatic
     fun shouldSendTypingIndicator(address: Address): Boolean {
         return !address.isGroup
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/audio/DecodedAudio.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DecodedAudio.kt
similarity index 99%
rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/audio/DecodedAudio.kt
rename to app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DecodedAudio.kt
index 12c965428b..77f7f88983 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/audio/DecodedAudio.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DecodedAudio.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki.utilities.audio
+package org.thoughtcrime.securesms.loki.utilities
 
 import android.media.AudioFormat
 import android.media.MediaCodec
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
index 56ddb0f3c5..86028521f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
@@ -14,7 +14,7 @@ import android.view.ViewConfiguration
 import android.view.animation.DecelerateInterpolator
 import androidx.core.math.MathUtils
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.loki.utilities.audio.byteToNormalizedFloat
+import org.thoughtcrime.securesms.loki.utilities.byteToNormalizedFloat
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min