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

Introduce SignalNetwork, share PushServiceSocket.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-09-03 15:20:31 -04:00
committed by Cody Henthorne
parent 4e35906680
commit 00d20a1917
18 changed files with 190 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
View File

@@ -38,34 +38,6 @@ public class AccountManagerFactory {
}
private static final String TAG = Log.tag(AccountManagerFactory.class);
public @NonNull SignalServiceAccountManager createAuthenticated(@NonNull Context context,
@NonNull ACI aci,
@NonNull PNI pni,
@NonNull String e164,
int deviceId,
@NonNull String password)
{
if (AppDependencies.getSignalServiceNetworkAccess().isCensored(e164)) {
SignalExecutors.BOUNDED.execute(() -> {
try {
ProviderInstaller.installIfNeeded(context);
} catch (Throwable t) {
Log.w(TAG, t);
}
});
}
return new SignalServiceAccountManager(AppDependencies.getSignalServiceNetworkAccess().getConfiguration(e164),
aci,
pni,
e164,
deviceId,
password,
BuildConfig.SIGNAL_AGENT,
RemoteConfig.okHttpAutomaticRetry(),
RemoteConfig.groupLimits().getHardLimit());
}
/**
* Should only be used during registration when you haven't yet been assigned an ACI.
*/
@@ -84,15 +56,17 @@ public class AccountManagerFactory {
});
}
return new SignalServiceAccountManager(AppDependencies.getSignalServiceNetworkAccess().getConfiguration(e164),
null,
null,
e164,
deviceId,
password,
BuildConfig.SIGNAL_AGENT,
RemoteConfig.okHttpAutomaticRetry(),
RemoteConfig.groupLimits().getHardLimit());
return SignalServiceAccountManager.createWithStaticCredentials(
AppDependencies.getSignalServiceNetworkAccess().getConfiguration(e164),
null,
null,
e164,
deviceId,
password,
BuildConfig.SIGNAL_AGENT,
RemoteConfig.okHttpAutomaticRetry(),
RemoteConfig.groupLimits().getHardLimit()
);
}
}