Skip to content

leaner VoiceNotePlaybackService footprint #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

leaner VoiceNotePlaybackService footprint #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef7233d
leaner VoiceNotePlaybackService footprint
philippelaporteproduct Dec 8, 2022
eb70dd7
Merge branch 'main' into CUS-754
philippelaporteproduct Mar 29, 2023
356c18f
changes re-applied after upstream merge
philippelaporteproduct Mar 29, 2023
c66aab1
cleanup
philippelaporteproduct Mar 30, 2023
353e15e
finishPostpone is too eager to start the voice note service
philippelaporteproduct Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public boolean onPreDraw() {
});


mediaController = new VoiceNoteMediaController(this, true);
mediaController = new VoiceNoteMediaController(this);

ConversationListTabRepository repository = new ConversationListTabRepository();
ConversationListTabsViewModel.Factory factory = new ConversationListTabsViewModel.Factory(repository);
Expand Down
60 changes: 27 additions & 33 deletions app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,13 @@ public class VoiceNoteMediaController implements DefaultLifecycleObserver {
private MutableLiveData<VoiceNotePlaybackState> voiceNotePlaybackState = new MutableLiveData<>(VoiceNotePlaybackState.NONE);
private LiveData<Optional<VoiceNotePlayerView.State>> voiceNotePlayerViewState;
private VoiceNoteProximityWakeLockManager voiceNoteProximityWakeLockManager;
private boolean isMediaBrowserCreationPostponed;

private final MediaControllerCompatCallback mediaControllerCompatCallback = new MediaControllerCompatCallback();
private Runnable onConnectRunnable;

public VoiceNoteMediaController(@NonNull FragmentActivity activity) {
this(activity, false);
}

public VoiceNoteMediaController(@NonNull FragmentActivity activity, boolean postponeMediaBrowserCreation) {
public VoiceNoteMediaController(@NonNull FragmentActivity activity) {
this.activity = activity;
this.isMediaBrowserCreationPostponed = postponeMediaBrowserCreation;

activity.getLifecycle().addObserver(this);

Expand Down Expand Up @@ -98,7 +94,7 @@ public VoiceNoteMediaController(@NonNull FragmentActivity activity, boolean post
});
}

public void ensureMediaBrowser() {
private void ensureMediaBrowser() {
if (mediaBrowser != null) {
return;
}
Expand All @@ -117,25 +113,6 @@ public LiveData<Optional<VoiceNotePlayerView.State>> getVoiceNotePlayerViewState
return voiceNotePlayerViewState;
}

public void finishPostpone() {
isMediaBrowserCreationPostponed = false;
if (activity != null && mediaBrowser == null && activity.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
ensureMediaBrowser();
mediaBrowser.disconnect();
mediaBrowser.connect();
}
}

@Override
public void onResume(@NonNull LifecycleOwner owner) {
if (mediaBrowser == null && isMediaBrowserCreationPostponed) {
return;
}

ensureMediaBrowser();
mediaBrowser.disconnect();
mediaBrowser.connect();
}

@Override
public void onPause(@NonNull LifecycleOwner owner) {
Expand All @@ -144,10 +121,6 @@ public void onPause(@NonNull LifecycleOwner owner) {
if (MediaControllerCompat.getMediaController(activity) != null) {
MediaControllerCompat.getMediaController(activity).unregisterCallback(mediaControllerCompatCallback);
}

if (mediaBrowser != null) {
mediaBrowser.disconnect();
}
}

@Override
Expand Down Expand Up @@ -185,15 +158,30 @@ private static boolean isPlayerStopped(@NonNull PlaybackStateCompat playbackStat


public void startConsecutivePlayback(@NonNull Uri audioSlideUri, long messageId, double progress) {
startPlayback(audioSlideUri, messageId, -1, progress, false);
onConnectRunnable = () -> startPlayback(audioSlideUri, messageId, -1, progress, false);
ensureMediaBrowser();
if (mediaBrowser.isConnected()) {
mediaBrowser.disconnect();
}
mediaBrowser.connect();
}

public void startSinglePlayback(@NonNull Uri audioSlideUri, long messageId, double progress) {
startPlayback(audioSlideUri, messageId, -1, progress, true);
onConnectRunnable = () -> startPlayback(audioSlideUri, messageId, -1, progress, true);
ensureMediaBrowser();
if (mediaBrowser.isConnected()) {
mediaBrowser.disconnect();
}
mediaBrowser.connect();
}

public void startSinglePlaybackForDraft(@NonNull Uri draftUri, long threadId, double progress) {
startPlayback(draftUri, -1, threadId, progress, true);
onConnectRunnable = () -> startPlayback(draftUri, -1, threadId, progress, true);
ensureMediaBrowser();
if (mediaBrowser.isConnected()) {
mediaBrowser.disconnect();
}
mediaBrowser.connect();
}

/**
Expand Down Expand Up @@ -395,6 +383,11 @@ public void onConnected() {
mediaController.registerCallback(mediaControllerCompatCallback);

mediaControllerCompatCallback.onPlaybackStateChanged(mediaController.getPlaybackState());

if (onConnectRunnable != null) {
onConnectRunnable.run();
onConnectRunnable = null;
}
}

@Override
Expand All @@ -407,6 +400,7 @@ public void onConnectionSuspended() {
public void onConnectionFailed() {
Log.d(TAG, "Voice note MediaBrowser connection failed.");
cleanUpOldProximityWakeLockManager();
onConnectRunnable = null;
}

private void cleanUpOldProximityWakeLockManager() {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
return;
}

voiceNoteMediaController = new VoiceNoteMediaController(requireActivity(), true);
voiceNoteMediaController = new VoiceNoteMediaController(requireActivity());
voiceRecorderWakeLock = new VoiceRecorderWakeLock(requireActivity());

// TODO [alex] LargeScreenSupport -- Should be removed once we move to multi-pane layout.
Expand Down Expand Up @@ -3924,7 +3924,6 @@ public void onFirstRender() {
if (getActivity() != null) {
requireActivity().supportStartPostponedEnterTransition();
}
voiceNoteMediaController.finishPostpone();
}

@Override
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,6 @@ private void onFirstRender() {
AppStartup.getInstance().onCriticalRenderEventEnd();
startupStopwatch.split("first-render");
startupStopwatch.stop(TAG);
mediaControllerOwner.getVoiceNoteMediaController().finishPostpone();

if (getParentFragment() != null) {
requireCallback().getSearchToolbar().get();
Expand Down