Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Initialize AppDependencies if needed in AvatarProvider.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-09-05 15:45:48 -04:00
committed by Cody Henthorne
parent 9261c34213
commit 6112ee9bd3
26 changed files with 154 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
View File

@@ -46,6 +46,7 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.util.AppForegroundObserver;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.ServiceUtil;
@@ -229,7 +230,7 @@ public class KeyCachingService extends Service {
}
private static void startTimeoutIfAppropriate(@NonNull Context context) {
boolean appVisible = AppDependencies.getAppForegroundObserver().isForegrounded();
boolean appVisible = AppForegroundObserver.isForegrounded();
boolean secretSet = KeyCachingService.masterSecret != null;
boolean timeoutEnabled = SignalStore.settings().getPassphraseTimeoutEnabled();

3
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java
View File

@@ -10,6 +10,7 @@ import org.thoughtcrime.securesms.events.WebRtcViewModel;
import org.thoughtcrime.securesms.ringrtc.Camera;
import org.thoughtcrime.securesms.ringrtc.RemotePeer;
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
import org.thoughtcrime.securesms.util.AppForegroundObserver;
import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
import org.thoughtcrime.securesms.webrtc.locks.LockManager;
@@ -43,7 +44,7 @@ public class CallSetupActionProcessorDelegate extends WebRtcActionProcessor {
currentState.getCallSetupState(activePeer).isAcceptWithVideo() || currentState.getLocalDeviceState().getCameraState().isEnabled()
);
AppDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
AppForegroundObserver.removeListener(webRtcInteractor.getForegroundListener());
webRtcInteractor.startAudioCommunication();
webRtcInteractor.activateCall(activePeer.getId());

3
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingCallActionProcessor.java
View File

@@ -25,6 +25,7 @@ import org.thoughtcrime.securesms.ringrtc.RemotePeer;
import org.thoughtcrime.securesms.service.webrtc.state.CallSetupState;
import org.thoughtcrime.securesms.service.webrtc.state.VideoState;
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
import org.thoughtcrime.securesms.util.AppForegroundObserver;
import org.thoughtcrime.securesms.util.NetworkUtil;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.webrtc.locks.LockManager;
@@ -191,7 +192,7 @@ public class IncomingCallActionProcessor extends DeviceAwareActionProcessor {
boolean started = webRtcInteractor.startWebRtcCallActivityIfPossible();
if (!started) {
Log.i(TAG, "Unable to start call activity due to OS version or not being in the foreground");
AppDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
AppForegroundObserver.addListener(webRtcInteractor.getForegroundListener());
}
}

3
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java
View File

@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.notifications.DoNotDisturbUtil;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.ringrtc.RemotePeer;
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
import org.thoughtcrime.securesms.util.AppForegroundObserver;
import org.thoughtcrime.securesms.util.NetworkUtil;
import org.thoughtcrime.securesms.webrtc.locks.LockManager;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
@@ -128,7 +129,7 @@ public final class IncomingGroupCallActionProcessor extends DeviceAwareActionPro
boolean started = webRtcInteractor.startWebRtcCallActivityIfPossible();
if (!started) {
Log.i(TAG, "Unable to start call activity due to OS version or not being in the foreground");
AppDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
AppForegroundObserver.addListener(webRtcInteractor.getForegroundListener());
}
}

6
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
View File

@@ -991,7 +991,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
Log.i(TAG, "Starting call activity from foreground listener");
startCallCardActivityIfPossible();
}
AppDependencies.getAppForegroundObserver().removeListener(this);
AppForegroundObserver.removeListener(this);
return s;
});
}
@@ -1218,7 +1218,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
}
public void relaunchPipOnForeground() {
AppDependencies.getAppForegroundObserver().addListener(new RelaunchListener(AppDependencies.getAppForegroundObserver().isForegrounded()));
AppForegroundObserver.addListener(new RelaunchListener(AppForegroundObserver.isForegrounded()));
}
private void processSendMessageFailureWithChangeDetection(@NonNull RemotePeer remotePeer,
@@ -1265,7 +1265,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
return s;
});
}
AppDependencies.getAppForegroundObserver().removeListener(this);
AppForegroundObserver.removeListener(this);
}
}

3
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java
View File

@@ -44,6 +44,7 @@ import org.thoughtcrime.securesms.service.webrtc.WebRtcData.ReceivedOfferMetadat
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcEphemeralState;
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceStateBuilder;
import org.thoughtcrime.securesms.util.AppForegroundObserver;
import org.thoughtcrime.securesms.util.NetworkUtil;
import org.thoughtcrime.securesms.util.TelephonyUtil;
import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
@@ -692,7 +693,7 @@ public abstract class WebRtcActionProcessor {
activePeer = remotePeer;
}
AppDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
AppForegroundObserver.removeListener(webRtcInteractor.getForegroundListener());
if (activePeer.getState() != CallState.IDLE) {
webRtcInteractor.updatePhoneState(LockManager.PhoneState.PROCESSING);