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

Use extension functions instead of LibSignalNetwork class.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-05-22 18:57:31 -04:00
committed by Cody Henthorne
parent 6069dfc6f8
commit 3d382ee15e
9 changed files with 59 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
View File

@@ -88,7 +88,6 @@ import org.whispersystems.signalservice.internal.util.StaticCredentialsProvider;
import org.whispersystems.signalservice.internal.util.Util;
import org.whispersystems.signalservice.internal.websocket.DefaultResponseMapper;
import org.signal.core.util.Base64;
import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
import java.io.IOException;
import java.security.MessageDigest;
@@ -371,7 +370,7 @@ public class SignalServiceAccountManager {
Optional<byte[]> token,
String mrEnclave,
Long timeoutMs,
@Nullable LibSignalNetwork libsignalNetwork,
@Nullable Network libsignalNetwork,
Consumer<byte[]> tokenSaver)
throws IOException
{

4
libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java
View File

@@ -19,13 +19,11 @@ import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulRespons
import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.signalservice.internal.ServiceResponse;
import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.lang.IllegalArgumentException;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -57,7 +55,7 @@ public final class CdsiV2Service {
private final CdsiRequestHandler cdsiRequestHandler;
public CdsiV2Service(SignalServiceConfiguration configuration, String mrEnclave, @Nullable LibSignalNetwork network) {
public CdsiV2Service(SignalServiceConfiguration configuration, String mrEnclave, @Nullable Network network) {
if (network != null) {
this.cdsiRequestHandler = (username, password, request, tokenSaver) -> {

59
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetwork.kt
View File

@@ -1,59 +0,0 @@
/*
* Copyright 2024 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.whispersystems.signalservice.internal.websocket
import org.signal.core.util.orNull
import org.signal.libsignal.internal.CompletableFuture
import org.signal.libsignal.net.CdsiLookupRequest
import org.signal.libsignal.net.CdsiLookupResponse
import org.signal.libsignal.net.ChatService
import org.signal.libsignal.net.Network
import org.whispersystems.signalservice.api.util.CredentialsProvider
import org.whispersystems.signalservice.internal.configuration.SignalProxy
import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
import java.io.IOException
import java.util.concurrent.ExecutionException
import java.util.function.Consumer
/**
* Makes Network API more ergonomic to use with Android client types
*/
class LibSignalNetwork(val network: Network, config: SignalServiceConfiguration) {
init {
resetSettings(config)
}
fun createChatService(
credentialsProvider: CredentialsProvider? = null
): ChatService {
val username = credentialsProvider?.username ?: ""
val password = credentialsProvider?.password ?: ""
return network.createChatService(username, password)
}
fun resetSettings(config: SignalServiceConfiguration) {
resetProxy(config.signalProxy.orNull())
}
private fun resetProxy(proxy: SignalProxy?) {
if (proxy == null) {
network.clearProxy()
} else {
network.setProxy(proxy.host, proxy.port)
}
}
// Delegates
@Throws(IOException::class, InterruptedException::class, ExecutionException::class)
fun cdsiLookup(
username: String?,
password: String?,
request: CdsiLookupRequest?,
tokenConsumer: Consumer<ByteArray?>
): CompletableFuture<CdsiLookupResponse?>? {
return network.cdsiLookup(username, password, request, tokenConsumer)
}
}

37
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright 2024 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
@file:JvmName("LibSignalNetworkExtensions")
package org.whispersystems.signalservice.internal.websocket
import org.signal.core.util.orNull
import org.signal.libsignal.net.ChatService
import org.signal.libsignal.net.Network
import org.whispersystems.signalservice.api.util.CredentialsProvider
import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
/**
* Helper method to create a ChatService with optional credentials.
*/
fun Network.createChatService(
credentialsProvider: CredentialsProvider? = null
): ChatService {
val username = credentialsProvider?.username ?: ""
val password = credentialsProvider?.password ?: ""
return this.createChatService(username, password)
}
/**
* Helper method to apply settings from the SignalServiceConfiguration.
*/
fun Network.applyConfiguration(config: SignalServiceConfiguration) {
val proxy = config.signalProxy.orNull()
if (proxy == null) {
this.clearProxy()
} else {
this.setProxy(proxy.host, proxy.port)
}
}