From 558d6741b159a21c4f1a12262a08101a391daab2 Mon Sep 17 00:00:00 2001 From: alansley Date: Fri, 9 Aug 2024 17:24:44 +1000 Subject: [PATCH] End of day push --- .../securesms/audio/AudioSlidePlayer.java | 26 +++++++------------ .../securesms/home/HomeActivity.kt | 2 -- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index ef404bb070..48b34376ca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -10,13 +10,11 @@ import android.net.Uri; import android.os.Build; import android.os.Handler; import android.os.Message; -import android.os.PowerManager; import android.os.PowerManager.WakeLock; +import android.os.PowerManager; +import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.util.Pair; -import android.widget.Toast; - import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.DefaultRenderersFactory; @@ -32,22 +30,16 @@ import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; - -import org.jetbrains.annotations.NotNull; -import org.thoughtcrime.securesms.attachments.AttachmentServer; -import org.session.libsignal.utilities.Log; -import org.thoughtcrime.securesms.mms.AudioSlide; -import org.session.libsession.utilities.ServiceUtil; - -import org.session.libsession.utilities.Util; - -import org.session.libsignal.utilities.guava.Optional; - import java.io.IOException; import java.lang.ref.WeakReference; - import network.loki.messenger.BuildConfig; -import network.loki.messenger.R; +import org.jetbrains.annotations.NotNull; +import org.session.libsession.utilities.ServiceUtil; +import org.session.libsession.utilities.Util; +import org.session.libsignal.utilities.Log; +import org.session.libsignal.utilities.guava.Optional; +import org.thoughtcrime.securesms.attachments.AttachmentServer; +import org.thoughtcrime.securesms.mms.AudioSlide; public class AudioSlidePlayer implements SensorEventListener { diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt index a3ecc7f20f..86ee3fb347 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt @@ -209,8 +209,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), // - 1 hour ago / 2 hours ago // - Yesterday / 2 days ago // - August 2nd / 2 weeks ago / 14 weeks ago <-- Note: Date running this test is August 9th. - - //DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_ABBREV_RELATIVE // Try this w/ just FORMAT_ABBREV_RELATIVE ).toString() }