Skip to content

Commit 6dd3fda

Browse files
committed
Remove usages of deprecated Handler constructor.
1 parent 64312f9 commit 6dd3fda

16 files changed

Lines changed: 42 additions & 20 deletions

app/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.os.Bundle;
1010
import android.os.Handler;
1111
import android.os.IBinder;
12+
import android.os.Looper;
1213
import android.os.Message;
1314
import android.os.Parcelable;
1415
import android.view.View;
@@ -158,6 +159,11 @@ private void handleImportComplete() {
158159
}
159160

160161
private class ImportStateHandler extends Handler {
162+
163+
public ImportStateHandler() {
164+
super(Looper.getMainLooper());
165+
}
166+
161167
@Override
162168
public void handleMessage(Message message) {
163169
switch (message.what) {

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.net.Uri;
66
import android.os.Bundle;
77
import android.os.Handler;
8+
import android.os.Looper;
89
import android.os.Message;
910
import android.os.RemoteException;
1011
import android.support.v4.media.MediaBrowserCompat;
@@ -208,17 +209,20 @@ public void onConnected() {
208209

209210
private static class ProgressEventHandler extends Handler {
210211

211-
private final MediaControllerCompat mediaController;
212-
private final MutableLiveData<VoiceNotePlaybackState> voiceNotePlaybackState;
212+
private final MediaControllerCompat mediaController;
213+
private final MutableLiveData<VoiceNotePlaybackState> voiceNotePlaybackState;
213214

214215
private ProgressEventHandler(@NonNull MediaControllerCompat mediaController,
215-
@NonNull MutableLiveData<VoiceNotePlaybackState> voiceNotePlaybackState) {
216+
@NonNull MutableLiveData<VoiceNotePlaybackState> voiceNotePlaybackState)
217+
{
218+
super(Looper.getMainLooper());
219+
216220
this.mediaController = mediaController;
217221
this.voiceNotePlaybackState = voiceNotePlaybackState;
218222
}
219223

220224
@Override
221-
public void handleMessage(Message msg) {
225+
public void handleMessage(@NonNull Message msg) {
222226
MediaMetadataCompat mediaMetadataCompat = mediaController.getMetadata();
223227
if (isPlayerActive(mediaController.getPlaybackState()) &&
224228
mediaMetadataCompat != null &&

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44
import android.database.ContentObserver;
55
import android.os.Handler;
6+
import android.os.Looper;
67
import android.text.TextUtils;
78

89
import androidx.annotation.NonNull;
@@ -35,7 +36,7 @@ private ConversationStickerViewModel(@NonNull Application application, @NonNull
3536
this.stickers = new MutableLiveData<>();
3637
this.stickersAvailable = new MutableLiveData<>();
3738
this.availabilityThrottler = new Throttler(500);
38-
this.packObserver = new ContentObserver(new Handler()) {
39+
this.packObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
3940
@Override
4041
public void onChange(boolean selfChange) {
4142
availabilityThrottler.publish(() -> repository.getStickerFeatureAvailability(stickersAvailable::postValue));

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Bundle;
44
import android.os.Handler;
5+
import android.os.Looper;
56
import android.view.LayoutInflater;
67
import android.view.View;
78
import android.view.ViewGroup;
@@ -32,7 +33,7 @@ public class MentionsPickerFragment extends LoggingFragment {
3233
private BottomSheetBehavior<View> behavior;
3334
private MentionsPickerViewModel viewModel;
3435
private final Runnable lockSheetAfterListUpdate = () -> behavior.setHideable(false);
35-
private final Handler handler = new Handler();
36+
private final Handler handler = new Handler(Looper.getMainLooper());
3637

3738
@Override
3839
public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.database.ContentObserver;
55
import android.net.Uri;
66
import android.os.Handler;
7+
import android.os.Looper;
78

89
import androidx.annotation.NonNull;
910
import androidx.lifecycle.LiveData;
@@ -30,7 +31,7 @@ private LongMessageViewModel(@NonNull Application application, @NonNull LongMess
3031
this.messageId = messageId;
3132
this.isMms = isMms;
3233
this.message = new MutableLiveData<>();
33-
this.messageObserver = new MessageObserver(new Handler());
34+
this.messageObserver = new MessageObserver(new Handler(Looper.getMainLooper()));
3435

3536
repository.getMessage(application, messageId, isMms, longMessage -> {
3637
if (longMessage.isPresent()) {

app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import android.content.Context;
2020
import android.net.Uri;
2121
import android.os.Handler;
22+
import android.os.Looper;
2223
import android.view.LayoutInflater;
2324
import android.view.View;
2425
import android.view.ViewGroup;
@@ -332,7 +333,7 @@ public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord me
332333
itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(mediaRecord));
333334
itemView.setOnLongClickListener(view -> onLongClick());
334335
selectForMarque = () -> line1.setSelected(true);
335-
handler = new Handler();
336+
handler = new Handler(Looper.getMainLooper());
336337
handler.postDelayed(selectForMarque, 2500);
337338

338339
LiveRecipient from = mediaRecord.isOutgoing() ? Recipient.self().live() : Recipient.live(mediaRecord.getRecipientId());

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.os.Build;
55
import android.os.Bundle;
66
import android.os.Handler;
7+
import android.os.Looper;
78
import android.view.LayoutInflater;
89
import android.view.View;
910
import android.view.ViewGroup;
@@ -34,7 +35,7 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E
3435
private static final String KEY_MAX_SEND = "max_send_size";
3536

3637
private final Throttler videoScanThrottle = new Throttler(150);
37-
private final Handler handler = new Handler();
38+
private final Handler handler = new Handler(Looper.getMainLooper());
3839

3940
private Controller controller;
4041
private Data data = new Data();

app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.app.Application;
44
import android.database.ContentObserver;
55
import android.net.Uri;
6-
import android.os.Handler;
76

87
import androidx.annotation.NonNull;
98
import androidx.lifecycle.LiveData;
@@ -33,7 +32,7 @@ private ViewOnceMessageViewModel(@NonNull Application application,
3332
this.application = application;
3433
this.repository = repository;
3534
this.message = new MutableLiveData<>();
36-
this.observer = new ContentObserver(new Handler()) {
35+
this.observer = new ContentObserver(null) {
3736
@Override
3837
public void onChange(boolean selfChange) {
3938
repository.getMessage(messageId, optionalMessage -> onMessageRetrieved(optionalMessage));

app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44
import android.database.ContentObserver;
55
import android.os.Handler;
6+
import android.os.Looper;
67

78
import androidx.annotation.NonNull;
89
import androidx.lifecycle.LiveData;
@@ -33,7 +34,7 @@ private StickerKeyboardPageViewModel(@NonNull Application application, @NonNull
3334
this.repository = repository;
3435
this.stickers = new MutableLiveData<>();
3536
this.observerThrottler = new Throttler(500);
36-
this.observer = new ContentObserver(new Handler()) {
37+
this.observer = new ContentObserver(new Handler(Looper.getMainLooper())) {
3738
@Override
3839
public void onChange(boolean selfChange) {
3940
observerThrottler.publish(() -> getStickers(packId));

app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44
import android.database.ContentObserver;
55
import android.os.Handler;
6+
import android.os.Looper;
67

78
import androidx.annotation.NonNull;
89
import androidx.lifecycle.LiveData;
@@ -25,7 +26,7 @@ private StickerKeyboardViewModel(@NonNull Application application, @NonNull Stic
2526
this.application = application;
2627
this.packs = new MutableLiveData<>();
2728
this.observerThrottler = new Throttler(500);
28-
this.observer = new ContentObserver(new Handler()) {
29+
this.observer = new ContentObserver(new Handler(Looper.getMainLooper())) {
2930
@Override
3031
public void onChange(boolean selfChange) {
3132
observerThrottler.publish(() -> repository.getPackList(packs::postValue));

0 commit comments

Comments
 (0)