TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop audio when leaving conversation.

Browse Source 
Fixes #4290
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-10-23 17:00:51 -07:00
parent a1f46b3aae
commit d70f0f1216
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -61,6 +61,7 @@ import com.google.protobuf.ByteString;
import org.thoughtcrime.redphone.RedPhone; import org.thoughtcrime.redphone.RedPhone;
import org.thoughtcrime.redphone.RedPhoneService; import org.thoughtcrime.redphone.RedPhoneService;
import org.thoughtcrime.securesms.TransportOptions.OnTransportChangedListener; import org.thoughtcrime.securesms.TransportOptions.OnTransportChangedListener;
import org.thoughtcrime.securesms.audio.AudioSlidePlayer;
import org.thoughtcrime.securesms.color.MaterialColor; import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.components.AnimatingToggle; import org.thoughtcrime.securesms.components.AnimatingToggle;
import org.thoughtcrime.securesms.components.ComposeText; import org.thoughtcrime.securesms.components.ComposeText;
@ -280,6 +281,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
MessageNotifier.setVisibleThread(-1L); MessageNotifier.setVisibleThread(-1L);
if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right); if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
quickAttachmentDrawer.onPause(); quickAttachmentDrawer.onPause();
AudioSlidePlayer.stopAll();
} }
@Override @Override

6
src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
View File

@ -133,6 +133,12 @@ public class AudioSlidePlayer {
this.audioAttachmentServer = null; this.audioAttachmentServer = null;
} }
public synchronized static void stopAll() {
if (playing.isPresent()) {
playing.get().stop();
}
}
public void setListener(@NonNull Listener listener) { public void setListener(@NonNull Listener listener) {
this.listener = new WeakReference<>(listener); this.listener = new WeakReference<>(listener);