Skip to content

Commit

Permalink
Fix seeking voice notes that do not have waveforms.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-signal
alex-signal authored Oct 16, 2020
1 parent 082d9e8 commit bd3b14a
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 50 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ interface EventListener {
void onRegisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
void onUnregisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
void onVoiceNotePause(@NonNull Uri uri);
void onVoiceNotePlay(@NonNull Uri uri, long messageId, long position);
void onVoiceNoteSeekTo(@NonNull Uri uri, long position);
void onVoiceNotePlay(@NonNull Uri uri, long messageId, double position);
void onVoiceNoteSeekTo(@NonNull Uri uri, double position);

/** @return true if handled, false if you want to let the normal url handling continue */
boolean onUrlClicked(@NonNull String url);
Expand Down
20 changes: 6 additions & 14 deletions app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void setDownloadClickListener(@Nullable SlideClickListener listener) {
private void onPlaybackState(@NonNull VoiceNotePlaybackState voiceNotePlaybackState) {
onStart(voiceNotePlaybackState.getUri(), voiceNotePlaybackState.isAutoReset());
onProgress(voiceNotePlaybackState.getUri(),
(double) voiceNotePlaybackState.getPlayheadPositionMillis() / durationMillis,
(double) voiceNotePlaybackState.getPlayheadPositionMillis() / voiceNotePlaybackState.getTrackDuration(),
voiceNotePlaybackState.getPlayheadPositionMillis());
}

Expand Down Expand Up @@ -258,7 +258,7 @@ public void setEnabled(boolean enabled) {
}

private void onProgress(@NonNull Uri uri, double progress, long millis) {
if (!Objects.equals(uri, audioSlide.getUri())) {
if (audioSlide == null || !Objects.equals(uri, audioSlide.getUri())) {
return;
}

Expand Down Expand Up @@ -358,7 +358,7 @@ public void onClick(View v) {

if (callbacks != null) {
if (lottieDirection == REVERSE) {
callbacks.onPlay(audioSlide.getUri(), getPosition());
callbacks.onPlay(audioSlide.getUri(), getProgress());
} else {
callbacks.onPause(audioSlide.getUri());
}
Expand All @@ -371,10 +371,6 @@ private void rewind() {
updateProgress(0, 0);
}

private long getPosition() {
return (long) (getProgress() * durationMillis);
}

private class DownloadClickedListener implements View.OnClickListener {
private final @NonNull AudioSlide slide;

Expand All @@ -394,10 +390,6 @@ private class SeekBarModifiedListener implements SeekBar.OnSeekBarChangeListener

@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (fromUser && durationMillis > 0) {
float progressFloat = progress / (float) seekBar.getMax();
updateProgress(progressFloat, (long) (durationMillis * progressFloat));
}
}

@Override
Expand All @@ -418,7 +410,7 @@ public synchronized void onStopTrackingTouch(SeekBar seekBar) {

if (callbacks != null) {
if (wasPlaying) {
callbacks.onSeekTo(audioSlide.getUri(), getPosition());
callbacks.onSeekTo(audioSlide.getUri(), getProgress());
}
}
}
Expand All @@ -439,9 +431,9 @@ public void onEventAsync(final PartProgressEvent event) {
}

public interface Callbacks {
void onPlay(@NonNull Uri audioUri, long position);
void onPlay(@NonNull Uri audioUri, double progress);
void onPause(@NonNull Uri audioUri);
void onSeekTo(@NonNull Uri audioUri, long position);
void onSeekTo(@NonNull Uri audioUri, double progress);
void onStopAndReset(@NonNull Uri audioUri);
}
}
29 changes: 17 additions & 12 deletions app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
public class VoiceNoteMediaController implements DefaultLifecycleObserver {

public static final String EXTRA_MESSAGE_ID = "voice.note.message_id";
public static final String EXTRA_PLAYHEAD = "voice.note.playhead";
public static final String EXTRA_PROGRESS = "voice.note.playhead";
public static final String EXTRA_PLAY_SINGLE = "voice.note.play.single";

private static final String TAG = Log.tag(VoiceNoteMediaController.class);
Expand Down Expand Up @@ -97,12 +97,12 @@ private static boolean isPlayerActive(@NonNull PlaybackStateCompat playbackState
}


public void startConsecutivePlayback(@NonNull Uri audioSlideUri, long messageId, long position) {
startPlayback(audioSlideUri, messageId, position, false);
public void startConsecutivePlayback(@NonNull Uri audioSlideUri, long messageId, double progress) {
startPlayback(audioSlideUri, messageId, progress, false);
}

public void startSinglePlayback(@NonNull Uri audioSlideUri, long messageId, long position) {
startPlayback(audioSlideUri, messageId, position, true);
public void startSinglePlayback(@NonNull Uri audioSlideUri, long messageId, double progress) {
startPlayback(audioSlideUri, messageId, progress, true);
}

/**
Expand All @@ -111,17 +111,19 @@ public void startSinglePlayback(@NonNull Uri audioSlideUri, long messageId, long
*
* @param audioSlideUri The Uri of the desired audio slide
* @param messageId The Message id of the given audio slide
* @param position The desired position in milliseconds at which to start playback.
* @param progress The desired progress % to seek to.
* @param singlePlayback The player will only play back the specified Uri, and not build a playlist.
*/
private void startPlayback(@NonNull Uri audioSlideUri, long messageId, long position, boolean singlePlayback) {
private void startPlayback(@NonNull Uri audioSlideUri, long messageId, double progress, boolean singlePlayback) {
if (isCurrentTrack(audioSlideUri)) {
getMediaController().getTransportControls().seekTo(position);
long duration = getMediaController().getMetadata().getLong(MediaMetadataCompat.METADATA_KEY_DURATION);

getMediaController().getTransportControls().seekTo((long) (duration * progress));
getMediaController().getTransportControls().play();
} else {
Bundle extras = new Bundle();
extras.putLong(EXTRA_MESSAGE_ID, messageId);
extras.putLong(EXTRA_PLAYHEAD, position);
extras.putDouble(EXTRA_PROGRESS, progress);
extras.putBoolean(EXTRA_PLAY_SINGLE, singlePlayback);

getMediaController().getTransportControls().playFromUri(audioSlideUri, extras);
Expand All @@ -144,12 +146,14 @@ public void pausePlayback(@NonNull Uri audioSlideUri) {
* is ignored if the given audio slide is not currently playing.
*
* @param audioSlideUri The Uri of the audio slide to seek.
* @param position The position in milliseconds to seek to.
* @param progress The progress percentage to seek to.
*/
public void seekToPosition(@NonNull Uri audioSlideUri, long position) {
public void seekToPosition(@NonNull Uri audioSlideUri, double progress) {
if (isCurrentTrack(audioSlideUri)) {
long duration = getMediaController().getMetadata().getLong(MediaMetadataCompat.METADATA_KEY_DURATION);

getMediaController().getTransportControls().pause();
getMediaController().getTransportControls().seekTo(position);
getMediaController().getTransportControls().seekTo((long) (duration * progress));
getMediaController().getTransportControls().play();
}
}
Expand Down Expand Up @@ -226,6 +230,7 @@ public void handleMessage(Message msg) {

voiceNotePlaybackState.postValue(new VoiceNotePlaybackState(mediaUri,
mediaController.getPlaybackState().getPosition(),
mediaMetadataCompat.getLong(MediaMetadataCompat.METADATA_KEY_DURATION),
autoReset));

sendEmptyMessageDelayed(0, 50);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void onPrepareFromSearch(String query, Bundle extras) {
@Override
public void onPrepareFromUri(final Uri uri, Bundle extras) {
long messageId = extras.getLong(VoiceNoteMediaController.EXTRA_MESSAGE_ID);
long position = extras.getLong(VoiceNoteMediaController.EXTRA_PLAYHEAD, 0);
double progress = extras.getDouble(VoiceNoteMediaController.EXTRA_PROGRESS, 0);
boolean singlePlayback = extras.getBoolean(VoiceNoteMediaController.EXTRA_PLAY_SINGLE, false);

canLoadMore = false;
Expand All @@ -116,7 +116,7 @@ public void onPrepareFromUri(final Uri uri, Bundle extras) {
@Override
public void onTimelineChanged(Timeline timeline, @Nullable Object manifest, int reason) {
if (timeline.getWindowCount() >= window) {
player.seekTo(window, position);
player.seekTo(window, (long) (player.getDuration() * progress));
player.removeListener(this);
}
}
Expand Down
13 changes: 11 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@
*/
public class VoiceNotePlaybackState {

public static final VoiceNotePlaybackState NONE = new VoiceNotePlaybackState(Uri.EMPTY, 0, false);
public static final VoiceNotePlaybackState NONE = new VoiceNotePlaybackState(Uri.EMPTY, 0, 0, false);

private final Uri uri;
private final long playheadPositionMillis;
private final long trackDuration;
private final boolean autoReset;

public VoiceNotePlaybackState(@NonNull Uri uri, long playheadPositionMillis, boolean autoReset) {
public VoiceNotePlaybackState(@NonNull Uri uri, long playheadPositionMillis, long trackDuration, boolean autoReset) {
this.uri = uri;
this.playheadPositionMillis = playheadPositionMillis;
this.trackDuration = trackDuration;
this.autoReset = autoReset;
}

Expand All @@ -35,6 +37,13 @@ public long getPlayheadPositionMillis() {
return playheadPositionMillis;
}

/**
* @return The track duration in ms
*/
public long getTrackDuration() {
return trackDuration;
}

/**
* @return true if we should reset the currently playing clip.
*/
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1377,13 +1377,13 @@ public void onVoiceNotePause(@NonNull Uri uri) {
}

@Override
public void onVoiceNotePlay(@NonNull Uri uri, long messageId, long position) {
voiceNoteMediaController.startConsecutivePlayback(uri, messageId, position);
public void onVoiceNotePlay(@NonNull Uri uri, long messageId, double progress) {
voiceNoteMediaController.startConsecutivePlayback(uri, messageId, progress);
}

@Override
public void onVoiceNoteSeekTo(@NonNull Uri uri, long position) {
voiceNoteMediaController.seekToPosition(uri, position);
public void onVoiceNoteSeekTo(@NonNull Uri uri, double progress) {
voiceNoteMediaController.seekToPosition(uri, progress);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1548,10 +1548,10 @@ public void updateDrawState(@NonNull TextPaint ds) { }
private final class AudioViewCallbacks implements AudioView.Callbacks {

@Override
public void onPlay(@NonNull Uri audioUri, long position) {
public void onPlay(@NonNull Uri audioUri, double progress) {
if (eventListener == null) return;

eventListener.onVoiceNotePlay(audioUri, messageRecord.getId(), position);
eventListener.onVoiceNotePlay(audioUri, messageRecord.getId(), progress);
}

@Override
Expand All @@ -1562,10 +1562,10 @@ public void onPause(@NonNull Uri audioUri) {
}

@Override
public void onSeekTo(@NonNull Uri audioUri, long position) {
public void onSeekTo(@NonNull Uri audioUri, double progress) {
if (eventListener == null) return;

eventListener.onVoiceNoteSeekTo(audioUri, position);
eventListener.onVoiceNoteSeekTo(audioUri, progress);
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,8 @@ private AudioViewCallbacksAdapter(@NonNull AudioItemListener audioItemListener,
}

@Override
public void onPlay(@NonNull Uri audioUri, long position) {
audioItemListener.onPlay(audioUri, position, messageId);
public void onPlay(@NonNull Uri audioUri, double progress) {
audioItemListener.onPlay(audioUri, progress, messageId);
}

@Override
Expand All @@ -512,8 +512,8 @@ public void onPause(@NonNull Uri audioUri) {
}

@Override
public void onSeekTo(@NonNull Uri audioUri, long position) {
audioItemListener.onSeekTo(audioUri, position);
public void onSeekTo(@NonNull Uri audioUri, double progress) {
audioItemListener.onSeekTo(audioUri, progress);
}

@Override
Expand All @@ -528,9 +528,9 @@ interface ItemClickListener {
}

interface AudioItemListener {
void onPlay(@NonNull Uri audioUri, long position, long messageId);
void onPlay(@NonNull Uri audioUri, double progress, long messageId);
void onPause(@NonNull Uri audioUri);
void onSeekTo(@NonNull Uri audioUri, long position);
void onSeekTo(@NonNull Uri audioUri, double progress);
void onStopAndReset(@NonNull Uri audioUri);
void registerPlaybackStateObserver(@NonNull Observer<VoiceNotePlaybackState> observer);
void unregisterPlaybackStateObserver(@NonNull Observer<VoiceNotePlaybackState> observer);
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ private void enterMultiSelect() {
}

@Override
public void onPlay(@NonNull Uri audioUri, long position, long messageId) {
voiceNoteMediaController.startSinglePlayback(audioUri, messageId, position);
public void onPlay(@NonNull Uri audioUri, double progress, long messageId) {
voiceNoteMediaController.startSinglePlayback(audioUri, messageId, progress);
}

@Override
Expand All @@ -321,8 +321,8 @@ public void onPause(@NonNull Uri audioUri) {
}

@Override
public void onSeekTo(@NonNull Uri audioUri, long position) {
voiceNoteMediaController.seekToPosition(audioUri, position);
public void onSeekTo(@NonNull Uri audioUri, double progress) {
voiceNoteMediaController.seekToPosition(audioUri, progress);
}

@Override
Expand Down

0 comments on commit bd3b14a

Please sign in to comment.