mirror of
https://github.com/AsamK/signal-cli
synced 2025-08-29 18:40:39 +00:00
Update libsignal-service-java
This commit is contained in:
parent
76ceac4d54
commit
0709c0caf8
6 changed files with 21 additions and 3 deletions
|
@ -14,7 +14,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api("com.github.turasa:signal-service-java:2.15.3_unofficial_27")
|
api("com.github.turasa:signal-service-java:2.15.3_unofficial_28")
|
||||||
implementation("com.google.protobuf:protobuf-javalite:3.10.0")
|
implementation("com.google.protobuf:protobuf-javalite:3.10.0")
|
||||||
implementation("org.bouncycastle:bcprov-jdk15on:1.69")
|
implementation("org.bouncycastle:bcprov-jdk15on:1.69")
|
||||||
implementation("org.slf4j:slf4j-api:1.7.30")
|
implementation("org.slf4j:slf4j-api:1.7.30")
|
||||||
|
|
|
@ -7,6 +7,7 @@ import org.whispersystems.libsignal.ecc.ECPublicKey;
|
||||||
import org.whispersystems.libsignal.util.guava.Optional;
|
import org.whispersystems.libsignal.util.guava.Optional;
|
||||||
import org.whispersystems.signalservice.api.push.TrustStore;
|
import org.whispersystems.signalservice.api.push.TrustStore;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
|
import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
|
||||||
|
import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
|
import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
|
import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalProxy;
|
import org.whispersystems.signalservice.internal.configuration.SignalProxy;
|
||||||
|
@ -38,6 +39,7 @@ class LiveConfig {
|
||||||
private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.signal.org";
|
private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.signal.org";
|
||||||
private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
|
private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
|
||||||
private final static String STORAGE_URL = "https://storage.signal.org";
|
private final static String STORAGE_URL = "https://storage.signal.org";
|
||||||
|
private final static String SIGNAL_CDSH_URL = "";
|
||||||
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
|
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
|
||||||
|
|
||||||
private final static Optional<Dns> dns = Optional.absent();
|
private final static Optional<Dns> dns = Optional.absent();
|
||||||
|
@ -58,6 +60,7 @@ class LiveConfig {
|
||||||
TRUST_STORE)},
|
TRUST_STORE)},
|
||||||
new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
|
new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
|
||||||
new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
|
new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
|
||||||
|
new SignalCdshUrl[]{new SignalCdshUrl(SIGNAL_CDSH_URL, TRUST_STORE)},
|
||||||
interceptors,
|
interceptors,
|
||||||
dns,
|
dns,
|
||||||
proxy,
|
proxy,
|
||||||
|
|
|
@ -7,6 +7,7 @@ import org.whispersystems.libsignal.ecc.ECPublicKey;
|
||||||
import org.whispersystems.libsignal.util.guava.Optional;
|
import org.whispersystems.libsignal.util.guava.Optional;
|
||||||
import org.whispersystems.signalservice.api.push.TrustStore;
|
import org.whispersystems.signalservice.api.push.TrustStore;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
|
import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
|
||||||
|
import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
|
import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
|
import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
|
||||||
import org.whispersystems.signalservice.internal.configuration.SignalProxy;
|
import org.whispersystems.signalservice.internal.configuration.SignalProxy;
|
||||||
|
@ -38,6 +39,7 @@ class SandboxConfig {
|
||||||
private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";
|
private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";
|
||||||
private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
|
private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
|
||||||
private final static String STORAGE_URL = "https://storage-staging.signal.org";
|
private final static String STORAGE_URL = "https://storage-staging.signal.org";
|
||||||
|
private final static String SIGNAL_CDSH_URL = "https://cdsh.staging.signal.org";
|
||||||
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
|
private final static TrustStore TRUST_STORE = new WhisperTrustStore();
|
||||||
|
|
||||||
private final static Optional<Dns> dns = Optional.absent();
|
private final static Optional<Dns> dns = Optional.absent();
|
||||||
|
@ -58,6 +60,7 @@ class SandboxConfig {
|
||||||
TRUST_STORE)},
|
TRUST_STORE)},
|
||||||
new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
|
new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
|
||||||
new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
|
new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
|
||||||
|
new SignalCdshUrl[]{new SignalCdshUrl(SIGNAL_CDSH_URL, TRUST_STORE)},
|
||||||
interceptors,
|
interceptors,
|
||||||
dns,
|
dns,
|
||||||
proxy,
|
proxy,
|
||||||
|
|
|
@ -39,7 +39,13 @@ public class ServiceConfig {
|
||||||
logger.warn("Failed to call libzkgroup: {}", e.getMessage());
|
logger.warn("Failed to call libzkgroup: {}", e.getMessage());
|
||||||
zkGroupAvailable = false;
|
zkGroupAvailable = false;
|
||||||
}
|
}
|
||||||
capabilities = new AccountAttributes.Capabilities(false, zkGroupAvailable, false, zkGroupAvailable, true, true);
|
capabilities = new AccountAttributes.Capabilities(false,
|
||||||
|
zkGroupAvailable,
|
||||||
|
false,
|
||||||
|
zkGroupAvailable,
|
||||||
|
true,
|
||||||
|
true,
|
||||||
|
false);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
TrustStore contactTrustStore = new IasTrustStore();
|
TrustStore contactTrustStore = new IasTrustStore();
|
||||||
|
|
|
@ -32,6 +32,7 @@ import java.nio.file.Files;
|
||||||
import java.util.Base64;
|
import java.util.Base64;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import io.reactivex.rxjava3.core.Single;
|
import io.reactivex.rxjava3.core.Single;
|
||||||
|
@ -136,7 +137,8 @@ public final class ProfileHelper {
|
||||||
newProfile.getAbout() == null ? "" : newProfile.getAbout(),
|
newProfile.getAbout() == null ? "" : newProfile.getAbout(),
|
||||||
newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
|
newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
|
||||||
Optional.absent(),
|
Optional.absent(),
|
||||||
streamDetails);
|
streamDetails,
|
||||||
|
List.of(/* TODO */));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (avatar != null) {
|
if (avatar != null) {
|
||||||
|
|
|
@ -188,6 +188,10 @@ public class StorageHelper {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!accountRecord.getE164().equals(account.getUsername())) {
|
||||||
|
// TODO implement changed number handling
|
||||||
|
}
|
||||||
|
|
||||||
account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
|
account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
|
||||||
account.getConfigurationStore().setTypingIndicators(accountRecord.isTypingIndicatorsEnabled());
|
account.getConfigurationStore().setTypingIndicators(accountRecord.isTypingIndicatorsEnabled());
|
||||||
account.getConfigurationStore()
|
account.getConfigurationStore()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue