TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-23 17:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to EventBus 3.X

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-02-17 20:27:11 -08:00
parent d5b7ff58e2
commit 1b1470aae2
9 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/components/AudioView.java
View File

@@ -22,6 +22,9 @@ import android.widget.TextView;
import com.pnikosis.materialishprogress.ProgressWheel;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.audio.AudioSlidePlayer;
import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -34,7 +37,6 @@ import org.thoughtcrime.securesms.util.Util;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import de.greenrobot.event.EventBus;
public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener {
@@ -97,7 +99,7 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().registerSticky(this);
if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this);
}
@Override
@@ -323,7 +325,7 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
}
}
@SuppressWarnings("unused")
@Subscribe(sticky = true, threadMode = ThreadMode.ASYNC)
public void onEventAsync(final PartProgressEvent event) {
if (audioSlidePlayer != null && event.attachment.equals(this.audioSlidePlayer.getAudioSlide().asAttachment())) {
Util.runOnMain(new Runnable() {

9
src/org/thoughtcrime/securesms/components/TransferControlView.java
View File

@@ -20,6 +20,9 @@ import com.nineoldandroids.animation.ValueAnimator;
import com.nineoldandroids.animation.ValueAnimator.AnimatorUpdateListener;
import com.pnikosis.materialishprogress.ProgressWheel;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.events.PartProgressEvent;
@@ -27,8 +30,6 @@ import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
import de.greenrobot.event.EventBus;
public class TransferControlView extends FrameLayout {
private static final int TRANSITION_MS = 300;
@@ -81,7 +82,7 @@ public class TransferControlView extends FrameLayout {
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().registerSticky(this);
if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this);
}
@Override
@@ -162,7 +163,7 @@ public class TransferControlView extends FrameLayout {
return anim;
}
@SuppressWarnings("unused")
@Subscribe(sticky = true, threadMode = ThreadMode.ASYNC)
public void onEventAsync(final PartProgressEvent event) {
if (this.slide != null && event.attachment.equals(this.slide.asAttachment())) {
Util.runOnMain(new Runnable() {