Merge pull request #696 from chklump/master

First attempt to display initial duration for audio attachements.
This commit is contained in:
björn petersen
2019-02-10 15:12:27 +01:00
committed by GitHub
6 changed files with 121 additions and 20 deletions
@@ -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);
@@ -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);
}
@@ -240,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);
}
});
}
@@ -255,7 +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(int millis) {}
};
}
@@ -320,7 +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 onProgress(double progress, int millis);
public void onReceivedDuration(int millis);
}
private static class ProgressEventHandler extends Handler {
@@ -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,12 +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.timestamp.setText(DateUtils.getFormatedDuration(duration));
}
public void setDuration(int duration) {
if (getProgress()==0)
this.timestamp.setText(DateUtils.getFormatedDuration(duration));
}
public void cleanup() {
@@ -98,6 +104,11 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
}
}
@Override
public void onReceivedDuration(int millis) {
this.timestamp.setText(DateUtils.getFormatedDuration(millis));
}
@Override
public void onStart() {
if (this.pauseButton.getVisibility() != View.VISIBLE) {
@@ -144,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++;
}
@@ -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);
}
@@ -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()) {
@@ -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)));
}
}