empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use the SignalServiceNetworkAccess from ApplicationDependencies.

Browse source
This commit is contained in:
Greyson Parrelli 2021-11-02 09:21:16 -04:00
parent f6542440c7
commit 8511d3576f
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View file

@ -351,7 +351,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
@WorkerThread
private void initializeCircumvention() {
if (new SignalServiceNetworkAccess(ApplicationContext.this).isCensored(ApplicationContext.this)) {
if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(ApplicationContext.this)) {
try {
ProviderInstaller.installIfNeeded(ApplicationContext.this);
} catch (Throwable t) {

2
app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
View file

@ -60,7 +60,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
protected final void onCreate(Bundle savedInstanceState) {
Tracer.getInstance().start(Log.tag(getClass()) + "#onCreate()");
AppStartup.getInstance().onCriticalRenderEventStart();
this.networkAccess = new SignalServiceNetworkAccess(this);
this.networkAccess = ApplicationDependencies.getSignalServiceNetworkAccess();
onPreCreate();
final boolean locked = KeyCachingService.isLocked(this);

2
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt
View file

@ -30,7 +30,7 @@ class VoiceNoteProximityWakeLockManager(
) : DefaultLifecycleObserver {
private val wakeLock: PowerManager.WakeLock? = if (Build.VERSION.SDK_INT >= 21) {
ServiceUtil.getPowerManager(activity).newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG)
ServiceUtil.getPowerManager(activity.applicationContext).newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG)
} else {
null
}

5
app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
View file

@ -9,6 +9,7 @@ import com.google.android.gms.security.ProviderInstaller;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.whispersystems.signalservice.api.SignalServiceAccountManager;
import org.whispersystems.signalservice.api.push.ACI;
@ -24,7 +25,7 @@ public class AccountManagerFactory {
@NonNull String number,
@NonNull String password)
{
if (new SignalServiceNetworkAccess(context).isCensored(number)) {
if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(number)) {
SignalExecutors.BOUNDED.execute(() -> {
try {
ProviderInstaller.installIfNeeded(context);
@ -34,7 +35,7 @@ public class AccountManagerFactory {
});
}
return new SignalServiceAccountManager(new SignalServiceNetworkAccess(context).getConfiguration(number),
return new SignalServiceAccountManager(ApplicationDependencies.getSignalServiceNetworkAccess().getConfiguration(number),
aci,
number,
password,

3
app/src/main/java/org/thoughtcrime/securesms/util/CensorshipUtil.java
View file

@ -4,6 +4,7 @@ import android.content.Context;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
public final class CensorshipUtil {
@ -11,6 +12,6 @@ public final class CensorshipUtil {
private CensorshipUtil() {}
public static boolean isCensored(@NonNull Context context) {
return new SignalServiceNetworkAccess(context).isCensored(context);
return ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(context);
}
}

2
app/src/mock/java/org/thoughtcrime/securesms/MockAppDataInitializer.java
View file

@ -100,7 +100,7 @@ final class MockAppDataInitializer {
TextSecurePreferences.setPromptedPushRegistration(context, true);
TextSecurePreferences.setLocalNumber(context, localE164);
TextSecurePreferences.setLocalUuid(context, Recipient.external(context, localE164).requireUuid());
TextSecurePreferences.setLocalAci(context, Recipient.external(context, localE164).requireAci());
TextSecurePreferences.setPushRegistered(context, true);
}
}