mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Use newer CellService observer when possible.

fork-5.53.8
Greyson Parrelli 2022-04-22 15:49:18 -04:00 zatwierdzone przez Cody Henthorne
rodzic 64b5dad783
commit 1446af97a2
2 zmienionych plików z 49 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

55
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
Wyświetl plik

@ -2,18 +2,24 @@ package org.thoughtcrime.securesms.jobmanager.impl;
import android.app.Application;
import android.content.Context;
import android.os.Build;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;
import org.thoughtcrime.securesms.util.ServiceUtil;
public class CellServiceConstraintObserver implements ConstraintObserver {
private static final String TAG = Log.tag(CellServiceConstraintObserver.class);
private static final String REASON = Log.tag(CellServiceConstraintObserver.class);
private volatile Notifier notifier;
@ -33,12 +39,16 @@ public class CellServiceConstraintObserver implements ConstraintObserver {
}
private CellServiceConstraintObserver(@NonNull Application application) {
TelephonyManager telephonyManager = (TelephonyManager) application.getSystemService(Context.TELEPHONY_SERVICE);
ServiceStateListener serviceStateListener = new ServiceStateListener();
TelephonyManager telephonyManager = ServiceUtil.getTelephonyManager(application);
LegacyServiceStateListener serviceStateListener = new LegacyServiceStateListener();
SignalExecutors.BOUNDED.execute(() -> {
telephonyManager.listen(serviceStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
});
if (Build.VERSION.SDK_INT >= 31) {
telephonyManager.registerTelephonyCallback(SignalExecutors.BOUNDED, new ServiceStateListenerApi31());
} else {
SignalExecutors.BOUNDED.execute(() -> {
telephonyManager.listen(serviceStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
});
}
}
@Override
@ -50,13 +60,42 @@ public class CellServiceConstraintObserver implements ConstraintObserver {
return lastKnownState != null && lastKnownState.getState() == ServiceState.STATE_IN_SERVICE;
}
private class ServiceStateListener extends PhoneStateListener {
@RequiresApi(31)
private class ServiceStateListenerApi31 extends TelephonyCallback implements TelephonyCallback.ServiceStateListener {
@Override
public void onServiceStateChanged(@NonNull ServiceState serviceState) {
lastKnownState = serviceState;
if (serviceState.getState() == ServiceState.STATE_IN_SERVICE) {
Log.i(TAG, "[API " + Build.VERSION.SDK_INT + "] Cell service available.");
if (notifier != null) {
notifier.onConstraintMet(REASON);
}
} else {
Log.w(TAG, "[API " + Build.VERSION.SDK_INT + "] Cell service unavailable. State: " + serviceState.getState());
}
}
}
private class LegacyServiceStateListener extends PhoneStateListener {
LegacyServiceStateListener() {
super();
}
@Override
public void onServiceStateChanged(ServiceState serviceState) {
lastKnownState = serviceState;
if (serviceState.getState() == ServiceState.STATE_IN_SERVICE && notifier != null) {
notifier.onConstraintMet(REASON);
if (serviceState.getState() == ServiceState.STATE_IN_SERVICE) {
Log.i(TAG, "[API " + Build.VERSION.SDK_INT + "] Cell service available.");
if (notifier != null) {
notifier.onConstraintMet(REASON);
}
} else {
Log.w(TAG, "[API " + Build.VERSION.SDK_INT + "] Cell service unavailable. State: " + serviceState.getState());
}
}
}

2
app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
Wyświetl plik

@ -116,6 +116,8 @@ public class SmsSendJob extends SendJob {
if (threadId != -1 && recipient != null) {
ApplicationDependencies.getMessageNotifier().notifyMessageDeliveryFailed(context, recipient, threadId);
} else {
Log.w(TAG, "Could not find message! threadId: " + threadId + ", recipient: " + (recipient != null ? recipient.getId().toString() : "null"));
}
}