From ea20bf20c6b40fbef088dc8cedc889cb013d4962 Mon Sep 17 00:00:00 2001 From: chklump Date: Sat, 2 Feb 2019 19:21:39 +0100 Subject: [PATCH 1/2] First attempt to display initial duration for audio attachements. --- .../securesms/audio/AudioSlidePlayer.java | 45 +++++++++++++++++++ .../securesms/components/AudioView.java | 8 ++++ 2 files changed, 53 insertions(+) diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index 01d7cff14..69332e83c 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -78,6 +78,48 @@ public class AudioSlidePlayer implements SensorEventListener { } } + public void requestDuration() { + if(this.mediaPlayer == null) { + this.mediaPlayer = new MediaPlayerWrapper(); + try { + this.audioAttachmentServer = new AttachmentServer(context, slide.asAttachment()); + this.startTime = System.currentTimeMillis(); + + audioAttachmentServer.start(); + this.mediaPlayer.setDataSource(context, audioAttachmentServer.getUri()); + + mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { + @Override + public void onPrepared(MediaPlayer mp) { + Log.w(TAG, "onPrepared"); + synchronized (AudioSlidePlayer.this) { + if (mediaPlayer == null) return; + } + getListener().onReceivedDuration(mediaPlayer.getDuration()); + if (mediaPlayer != null) { + mediaPlayer.stop(); + mediaPlayer.release(); + } + + if (audioAttachmentServer != null) { + audioAttachmentServer.stop(); + } + + mediaPlayer = null; + audioAttachmentServer = null; + } + }); + mediaPlayer.prepareAsync(); + + } catch (IOException e) { + Log.w(TAG, e); + getListener().onReceivedDuration(0); + } + } else { + getListener().onReceivedDuration(0); + } + } + public void play(final double progress) throws IOException { play(progress, false); } @@ -256,6 +298,8 @@ public class AudioSlidePlayer implements SensorEventListener { public void onStop() {} @Override public void onProgress(double progress, long millis) {} + @Override + public void onReceivedDuration(long millis) {} }; } @@ -321,6 +365,7 @@ public class AudioSlidePlayer implements SensorEventListener { public void onStart(); public void onStop(); public void onProgress(double progress, long millis); + public void onReceivedDuration(long millis); } private static class ProgressEventHandler extends Handler { diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java index 2a52cb35f..8a3891683 100644 --- a/src/org/thoughtcrime/securesms/components/AudioView.java +++ b/src/org/thoughtcrime/securesms/components/AudioView.java @@ -90,6 +90,7 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener controlToggle.displayQuick(playButton); seekBar.setEnabled(true); this.audioSlidePlayer = AudioSlidePlayer.createFor(getContext(), audio, this); + this.audioSlidePlayer.requestDuration(); } public void cleanup() { @@ -98,6 +99,13 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener } } + @Override + public void onReceivedDuration(long millis) { + this.timestamp.setText(String.format("%02d:%02d", + TimeUnit.MILLISECONDS.toMinutes(millis), + TimeUnit.MILLISECONDS.toSeconds(millis))); + } + @Override public void onStart() { if (this.pauseButton.getVisibility() != View.VISIBLE) { From 544f19315bab6707bd220b736bf23d29fd932822 Mon Sep 17 00:00:00 2001 From: chklump Date: Sun, 10 Feb 2019 00:52:23 +0100 Subject: [PATCH 2/2] First attempt to display initial duration for audio attachements. --- .../securesms/ConversationItem.java | 31 ++++++++++++++++--- .../securesms/audio/AudioSlidePlayer.java | 10 +++--- .../securesms/components/AudioView.java | 23 +++++++------- .../RemovableEditableMediaView.java | 4 +++ .../securesms/mms/AttachmentManager.java | 28 ++++++++++++----- .../securesms/util/DateUtils.java | 6 ++++ 6 files changed, 75 insertions(+), 27 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 8d14891bf..760475343 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -31,7 +31,6 @@ import android.text.TextUtils; import android.text.style.URLSpan; import android.text.util.Linkify; import android.util.AttributeSet; -import android.util.Log; import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; @@ -42,6 +41,7 @@ import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcMsg; +import org.thoughtcrime.securesms.audio.AudioSlidePlayer; import org.thoughtcrime.securesms.components.AudioView; import org.thoughtcrime.securesms.components.AvatarImageView; import org.thoughtcrime.securesms.components.ConversationItemFooter; @@ -57,7 +57,6 @@ import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.SlideClickListener; import org.thoughtcrime.securesms.mms.VideoSlide; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.LongClickCopySpan; import org.thoughtcrime.securesms.util.LongClickMovementMethod; import org.thoughtcrime.securesms.util.Prefs; @@ -380,6 +379,22 @@ public class ConversationItem extends LinearLayout { boolean showControls = !messageRecord.isFailed() && !Util.isOwnNumber(context, conversationRecipient.getAddress()); + class SetDurationListener implements AudioSlidePlayer.Listener { + @Override + public void onStart() {} + + @Override + public void onStop() {} + + @Override + public void onProgress(double progress, int millis) {} + + @Override + public void onReceivedDuration(int millis) { + messageRecord.lateFilingMediaSize(0,0, millis); + audioViewStub.get().setDuration(millis); + } + } if (hasAudio(messageRecord)) { audioViewStub.get().setVisibility(View.VISIBLE); if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE); @@ -392,8 +407,16 @@ public class ConversationItem extends LinearLayout // if he wants to start the chat on click. audioViewStub.get().setEnabled(false); audioViewStub.get().setOnClickListener(passthroughClickListener); - } else - audioViewStub.get().setAudio(new AudioSlide(context, messageRecord), showControls); + } else { + int duration = messageRecord.getDuration(); + if (duration == 0) { + AudioSlide audio = new AudioSlide(context, messageRecord); + AudioSlidePlayer audioSlidePlayer = AudioSlidePlayer.createFor(getContext(), audio, new SetDurationListener()); + audioSlidePlayer.requestDuration(); + } + + audioViewStub.get().setAudio(new AudioSlide(context, messageRecord), showControls, duration); + } audioViewStub.get().setOnLongClickListener(passthroughClickListener); ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index 69332e83c..cd1699535 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -282,7 +282,7 @@ public class AudioSlidePlayer implements SensorEventListener { Util.runOnMain(new Runnable() { @Override public void run() { - getListener().onProgress(progress, millis); + getListener().onProgress(progress, (int) millis); } }); } @@ -297,9 +297,9 @@ public class AudioSlidePlayer implements SensorEventListener { @Override public void onStop() {} @Override - public void onProgress(double progress, long millis) {} + public void onProgress(double progress, int millis) {} @Override - public void onReceivedDuration(long millis) {} + public void onReceivedDuration(int millis) {} }; } @@ -364,8 +364,8 @@ public class AudioSlidePlayer implements SensorEventListener { public interface Listener { public void onStart(); public void onStop(); - public void onProgress(double progress, long millis); - public void onReceivedDuration(long millis); + public void onProgress(double progress, int millis); + public void onReceivedDuration(int millis); } private static class ProgressEventHandler extends Handler { diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java index 8a3891683..cb5db3b34 100644 --- a/src/org/thoughtcrime/securesms/components/AudioView.java +++ b/src/org/thoughtcrime/securesms/components/AudioView.java @@ -23,9 +23,9 @@ import android.widget.TextView; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.audio.AudioSlidePlayer; import org.thoughtcrime.securesms.mms.AudioSlide; +import org.thoughtcrime.securesms.util.DateUtils; import java.io.IOException; -import java.util.concurrent.TimeUnit; public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener { @@ -84,13 +84,18 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener } public void setAudio(final @NonNull AudioSlide audio, - final boolean showControls) + final boolean showControls, int duration) { controlToggle.displayQuick(playButton); seekBar.setEnabled(true); this.audioSlidePlayer = AudioSlidePlayer.createFor(getContext(), audio, this); - this.audioSlidePlayer.requestDuration(); + this.timestamp.setText(DateUtils.getFormatedDuration(duration)); + } + + public void setDuration(int duration) { + if (getProgress()==0) + this.timestamp.setText(DateUtils.getFormatedDuration(duration)); } public void cleanup() { @@ -100,10 +105,8 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener } @Override - public void onReceivedDuration(long millis) { - this.timestamp.setText(String.format("%02d:%02d", - TimeUnit.MILLISECONDS.toMinutes(millis), - TimeUnit.MILLISECONDS.toSeconds(millis))); + public void onReceivedDuration(int millis) { + this.timestamp.setText(DateUtils.getFormatedDuration(millis)); } @Override @@ -152,15 +155,13 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener } @Override - public void onProgress(double progress, long millis) { + public void onProgress(double progress, int millis) { int seekProgress = (int)Math.floor(progress * this.seekBar.getMax()); if (seekProgress > seekBar.getProgress() || backwardsCounter > 3) { backwardsCounter = 0; this.seekBar.setProgress(seekProgress); - this.timestamp.setText(String.format("%02d:%02d", - TimeUnit.MILLISECONDS.toMinutes(millis), - TimeUnit.MILLISECONDS.toSeconds(millis))); + this.timestamp.setText(DateUtils.getFormatedDuration(millis)); } else { backwardsCounter++; } diff --git a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java index b31828ce0..9d3c30c51 100644 --- a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java +++ b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java @@ -69,6 +69,10 @@ public class RemovableEditableMediaView extends FrameLayout { current = view; } + public View getCurrent() { + return current; + } + public void setRemoveClickListener(View.OnClickListener listener) { this.remove.setOnClickListener(listener); } diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java index 4de6d908f..f60c21931 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -23,7 +23,6 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.graphics.Bitmap; import android.graphics.PorterDuff; import android.net.Uri; import android.os.AsyncTask; @@ -41,20 +40,17 @@ import android.widget.Toast; import org.thoughtcrime.securesms.MediaPreviewActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.Attachment; +import org.thoughtcrime.securesms.audio.AudioSlidePlayer; import org.thoughtcrime.securesms.components.AudioView; import org.thoughtcrime.securesms.components.DocumentView; import org.thoughtcrime.securesms.components.RemovableEditableMediaView; import org.thoughtcrime.securesms.components.ThumbnailView; -import org.thoughtcrime.securesms.components.location.SignalMapView; -import org.thoughtcrime.securesms.components.location.SignalPlace; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.providers.PersistentBlobProvider; import org.thoughtcrime.securesms.scribbles.ScribbleActivity; -import org.thoughtcrime.securesms.util.BitmapUtil; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.ViewUtil; -import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener; import org.thoughtcrime.securesms.util.concurrent.SettableFuture; @@ -244,7 +240,7 @@ public class AttachmentManager { @Override protected void onPostExecute(@Nullable final Slide slide) { - if (slide == null) { + if (slide == null) { attachmentViewStub.get().setVisibility(View.GONE); result.set(false); } else if (!areConstraintsSatisfied(context, slide, constraints)) { @@ -255,7 +251,25 @@ public class AttachmentManager { attachmentViewStub.get().setVisibility(View.VISIBLE); if (slide.hasAudio()) { - audioView.setAudio((AudioSlide) slide, false); + class SetDurationListener implements AudioSlidePlayer.Listener { + @Override + public void onStart() {} + + @Override + public void onStop() {} + + @Override + public void onProgress(double progress, int millis) {} + + @Override + public void onReceivedDuration(int millis) { + ((AudioView) removableMediaView.getCurrent()).setDuration(millis); + } + } + AudioSlidePlayer audioSlidePlayer = AudioSlidePlayer.createFor(context, (AudioSlide) slide, new SetDurationListener()); + audioSlidePlayer.requestDuration(); + + audioView.setAudio((AudioSlide) slide, false,0); removableMediaView.display(audioView, false); result.set(true); } else if (slide.hasDocument()) { diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java index fa165e1ce..160f78b69 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -169,4 +169,10 @@ public class DateUtils extends android.text.format.DateUtils { return new SimpleDateFormat(template, locale).toLocalizedPattern(); } } + + public static String getFormatedDuration(int millis) { + return String.format("%02d:%02d", + TimeUnit.MILLISECONDS.toMinutes(millis), + TimeUnit.MILLISECONDS.toSeconds(millis-(TimeUnit.MILLISECONDS.toMinutes(millis)*60000))); + } }