mirror of
https://github.com/AsamK/signal-cli
synced 2025-08-29 18:40:39 +00:00
Reformat code
This commit is contained in:
parent
a96c4938b1
commit
4f8da7819e
4 changed files with 27 additions and 28 deletions
|
@ -38,15 +38,15 @@ public class TrustCommand implements JsonRpcLocalCommand {
|
||||||
var recipentString = ns.getString("recipient");
|
var recipentString = ns.getString("recipient");
|
||||||
var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
|
var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
|
||||||
if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
|
if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
|
||||||
boolean res;
|
|
||||||
try {
|
try {
|
||||||
res = m.trustIdentityAllKeys(recipient);
|
final var res = m.trustIdentityAllKeys(recipient);
|
||||||
|
if (!res) {
|
||||||
|
throw new UserErrorException(
|
||||||
|
"Failed to set the trust for this number, make sure the number is correct.");
|
||||||
|
}
|
||||||
} catch (UnregisteredRecipientException e) {
|
} catch (UnregisteredRecipientException e) {
|
||||||
throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
|
throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
|
||||||
}
|
}
|
||||||
if (!res) {
|
|
||||||
throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
var safetyNumber = ns.getString("verified-safety-number");
|
var safetyNumber = ns.getString("verified-safety-number");
|
||||||
if (safetyNumber == null) {
|
if (safetyNumber == null) {
|
||||||
|
|
|
@ -669,8 +669,7 @@ public class DbusManagerImpl implements Manager {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean trustIdentityVerified(
|
public boolean trustIdentityVerified(
|
||||||
final RecipientIdentifier.Single recipient,
|
final RecipientIdentifier.Single recipient, final IdentityVerificationCode verificationCode
|
||||||
final IdentityVerificationCode verificationCode
|
|
||||||
) {
|
) {
|
||||||
throw new UnsupportedOperationException();
|
throw new UnsupportedOperationException();
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import org.asamk.signal.manager.api.GroupLinkState;
|
||||||
import org.asamk.signal.manager.api.GroupNotFoundException;
|
import org.asamk.signal.manager.api.GroupNotFoundException;
|
||||||
import org.asamk.signal.manager.api.GroupPermission;
|
import org.asamk.signal.manager.api.GroupPermission;
|
||||||
import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
|
import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
|
||||||
|
import org.asamk.signal.manager.api.IdentityVerificationCode;
|
||||||
import org.asamk.signal.manager.api.InactiveGroupLinkException;
|
import org.asamk.signal.manager.api.InactiveGroupLinkException;
|
||||||
import org.asamk.signal.manager.api.InvalidDeviceLinkException;
|
import org.asamk.signal.manager.api.InvalidDeviceLinkException;
|
||||||
import org.asamk.signal.manager.api.InvalidNumberException;
|
import org.asamk.signal.manager.api.InvalidNumberException;
|
||||||
|
@ -30,7 +31,6 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
|
||||||
import org.asamk.signal.manager.api.UpdateGroup;
|
import org.asamk.signal.manager.api.UpdateGroup;
|
||||||
import org.asamk.signal.manager.api.UpdateProfile;
|
import org.asamk.signal.manager.api.UpdateProfile;
|
||||||
import org.asamk.signal.manager.api.UserStatus;
|
import org.asamk.signal.manager.api.UserStatus;
|
||||||
import org.asamk.signal.manager.api.IdentityVerificationCode;
|
|
||||||
import org.asamk.signal.util.SendMessageResultUtils;
|
import org.asamk.signal.util.SendMessageResultUtils;
|
||||||
import org.freedesktop.dbus.DBusPath;
|
import org.freedesktop.dbus.DBusPath;
|
||||||
import org.freedesktop.dbus.connections.impl.DBusConnection;
|
import org.freedesktop.dbus.connections.impl.DBusConnection;
|
||||||
|
@ -55,8 +55,8 @@ import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
|
import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
|
||||||
|
|
||||||
|
@ -1054,16 +1054,17 @@ public class DbusSignalImpl implements Signal {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void unExportIdentities() {
|
private void unExportIdentities() {
|
||||||
this.identities.stream().map(StructIdentity::getObjectPath).map(DBusPath::getPath).forEach(connection::unExportObject);
|
this.identities.stream()
|
||||||
|
.map(StructIdentity::getObjectPath)
|
||||||
|
.map(DBusPath::getPath)
|
||||||
|
.forEach(connection::unExportObject);
|
||||||
this.identities.clear();
|
this.identities.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DBusPath getIdentity(String number) throws Error.Failure {
|
public DBusPath getIdentity(String number) throws Error.Failure {
|
||||||
|
|
||||||
final var found = identities.stream()
|
final var found = identities.stream().filter(identity -> identity.getName().equals(number)).findFirst();
|
||||||
.filter(identity -> identity.getName().equals(number))
|
|
||||||
.findFirst();
|
|
||||||
|
|
||||||
if (found.isEmpty()) {
|
if (found.isEmpty()) {
|
||||||
throw new Error.Failure("Identity for " + number + " unkown");
|
throw new Error.Failure("Identity for " + number + " unkown");
|
||||||
|
@ -1082,16 +1083,16 @@ public class DbusSignalImpl implements Signal {
|
||||||
private final org.asamk.signal.manager.api.Identity identity;
|
private final org.asamk.signal.manager.api.Identity identity;
|
||||||
|
|
||||||
public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
|
public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
|
||||||
this.identity=identity;
|
this.identity = identity;
|
||||||
super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
|
super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
|
||||||
List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
|
List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
|
||||||
new DbusProperty<>("Uuid", () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
|
new DbusProperty<>("Uuid",
|
||||||
|
() -> identity.recipient().uuid().map(UUID::toString).orElse("")),
|
||||||
new DbusProperty<>("Fingerprint", () -> identity.getFingerprint()),
|
new DbusProperty<>("Fingerprint", () -> identity.getFingerprint()),
|
||||||
new DbusProperty<>("SafetyNumber", identity::safetyNumber),
|
new DbusProperty<>("SafetyNumber", identity::safetyNumber),
|
||||||
new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
|
new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
|
||||||
new DbusProperty<>("TrustLevel", identity::trustLevel),
|
new DbusProperty<>("TrustLevel", identity::trustLevel),
|
||||||
new DbusProperty<>("AddedDate", identity::dateAddedTimestamp)
|
new DbusProperty<>("AddedDate", identity::dateAddedTimestamp))));
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1101,21 +1102,20 @@ public class DbusSignalImpl implements Signal {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void trust() throws Error.Failure {
|
public void trust() throws Error.Failure {
|
||||||
var recipient=RecipientIdentifier.Single.fromAddress(identity.recipient());
|
var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
|
||||||
try {
|
try {
|
||||||
m.trustIdentityAllKeys(recipient);
|
m.trustIdentityAllKeys(recipient);
|
||||||
} catch (UnregisteredRecipientException e) {
|
} catch (UnregisteredRecipientException e) {
|
||||||
throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
|
throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void trustVerified(String safetyNumber) throws Error.Failure {
|
public void trustVerified(String safetyNumber) throws Error.Failure {
|
||||||
var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
|
var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
|
||||||
|
|
||||||
if (safetyNumber == null) {
|
if (safetyNumber == null) {
|
||||||
throw new Error.Failure(
|
throw new Error.Failure("You need to specify a fingerprint/safety number");
|
||||||
"You need to specify a fingerprint/safety number");
|
|
||||||
}
|
}
|
||||||
final IdentityVerificationCode verificationCode;
|
final IdentityVerificationCode verificationCode;
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue