mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-21 00:59:49 +01:00
Rewrite the AppDependencies system.
This commit is contained in:
committed by
Cody Henthorne
parent
a0131bf39b
commit
b6a4e1f145
@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.backup.BackupDialog;
|
||||
import org.thoughtcrime.securesms.backup.BackupEvent;
|
||||
import org.thoughtcrime.securesms.database.NoExternalStorageException;
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies;
|
||||
import org.thoughtcrime.securesms.jobs.LocalBackupJob;
|
||||
import org.thoughtcrime.securesms.keyvalue.SignalStore;
|
||||
import org.thoughtcrime.securesms.permissions.Permissions;
|
||||
@@ -311,6 +311,6 @@ public class BackupsPreferenceFragment extends Fragment {
|
||||
folder.setVisibility(View.GONE);
|
||||
verify.setVisibility(View.GONE);
|
||||
timer.setVisibility(View.GONE);
|
||||
ApplicationDependencies.getJobManager().cancelAllInQueue(LocalBackupJob.QUEUE);
|
||||
AppDependencies.getJobManager().cancelAllInQueue(LocalBackupJob.QUEUE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import org.signal.core.util.concurrent.SignalExecutors;
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies;
|
||||
import org.thoughtcrime.securesms.keyvalue.SignalStore;
|
||||
import org.thoughtcrime.securesms.util.SignalProxyUtil;
|
||||
import org.thoughtcrime.securesms.util.Util;
|
||||
@@ -32,9 +32,8 @@ public class EditProxyViewModel extends ViewModel {
|
||||
this.uiState = BehaviorSubject.create();
|
||||
this.saveState = BehaviorSubject.createDefault(SaveState.IDLE);
|
||||
this.pipeState = SignalStore.account().getE164() == null ? Flowable.empty()
|
||||
: ApplicationDependencies.getSignalWebSocket()
|
||||
.getWebSocketState()
|
||||
.toFlowable(BackpressureStrategy.LATEST);
|
||||
: AppDependencies.getWebSocketObserver()
|
||||
.toFlowable(BackpressureStrategy.LATEST);
|
||||
|
||||
if (SignalStore.proxy().isProxyEnabled()) {
|
||||
uiState.onNext(UiState.ALL_ENABLED);
|
||||
|
||||
Reference in New Issue
Block a user