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

Rewrite the AppDependencies system.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-22 15:44:24 -04:00
committed by Cody Henthorne
parent a0131bf39b
commit b6a4e1f145
560 changed files with 2909 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java
View File

@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.database.GroupTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.GroupRecord;
import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.dependencies.AppDependencies;
import org.thoughtcrime.securesms.groups.GroupManager;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -50,8 +50,8 @@ class DeleteAccountRepository {
onDeleteAccountEvent.accept(DeleteAccountEvent.CancelingSubscription.INSTANCE);
InAppPaymentSubscriberRecord subscriber = InAppPaymentsRepository.requireSubscriber(InAppPaymentSubscriberRecord.Type.DONATION);
ServiceResponse<EmptyResponse> cancelSubscriptionResponse = ApplicationDependencies.getDonationsService()
.cancelSubscription(subscriber.getSubscriberId());
ServiceResponse<EmptyResponse> cancelSubscriptionResponse = AppDependencies.getDonationsService()
.cancelSubscription(subscriber.getSubscriberId());
if (cancelSubscriptionResponse.getExecutionError().isPresent()) {
Log.w(TAG, "deleteAccount: failed attempt to cancel subscription");
@@ -84,7 +84,7 @@ class DeleteAccountRepository {
while (groupRecord != null) {
if (groupRecord.getId().isPush() && groupRecord.isActive()) {
if (!groupRecord.isV1Group()) {
GroupManager.leaveGroup(ApplicationDependencies.getApplication(), groupRecord.getId().requirePush(), true);
GroupManager.leaveGroup(AppDependencies.getApplication(), groupRecord.getId().requirePush(), true);
}
onDeleteAccountEvent.accept(new DeleteAccountEvent.LeaveGroupsProgress(groups.getCount(), ++groupsLeft));
}
@@ -103,7 +103,7 @@ class DeleteAccountRepository {
Log.i(TAG, "deleteAccount: attempting to delete account from server...");
try {
ApplicationDependencies.getSignalServiceAccountManager().deleteAccount();
AppDependencies.getSignalServiceAccountManager().deleteAccount();
} catch (IOException e) {
Log.w(TAG, "deleteAccount: failed to delete account from signal service", e);
onDeleteAccountEvent.accept(DeleteAccountEvent.ServerDeletionFailed.INSTANCE);
@@ -113,7 +113,7 @@ class DeleteAccountRepository {
Log.i(TAG, "deleteAccount: successfully removed account from server");
Log.i(TAG, "deleteAccount: attempting to delete user data and close process...");
if (!ServiceUtil.getActivityManager(ApplicationDependencies.getApplication()).clearApplicationUserData()) {
if (!ServiceUtil.getActivityManager(AppDependencies.getApplication()).clearApplicationUserData()) {
Log.w(TAG, "deleteAccount: failed to delete user data");
onDeleteAccountEvent.accept(DeleteAccountEvent.LocalDataDeletionFailed.INSTANCE);
}