Browse Source

Correct method name to getUndecidedDevices

tags/4.2.1
vanitasvitae 3 years ago
parent
commit
419f6a336e
No known key found for this signature in database GPG Key ID: 62BEE9264BF17311
2 changed files with 13 additions and 13 deletions
  1. +5
    -5
      smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UndecidedOmemoIdentityException.java
  2. +8
    -8
      smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoExceptionsTest.java

+ 5
- 5
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UndecidedOmemoIdentityException.java View File

@@ -35,20 +35,20 @@ public class UndecidedOmemoIdentityException extends Exception {
}

/**
* Return the HashSet of untrusted devices.
* Return the HashSet of undecided devices.
*
* @return untrusted devices
* @return undecided devices
*/
public HashSet<OmemoDevice> getUntrustedDevices() {
public HashSet<OmemoDevice> getUndecidedDevices() {
return this.devices;
}

/**
* Add all untrusted devices of another Exception to this Exceptions HashSet of untrusted devices.
* Add all undecided devices of another Exception to this Exceptions HashSet of undecided devices.
*
* @param other other Exception
*/
public void join(UndecidedOmemoIdentityException other) {
this.devices.addAll(other.getUntrustedDevices());
this.devices.addAll(other.getUndecidedDevices());
}
}

+ 8
- 8
smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoExceptionsTest.java View File

@@ -45,18 +45,18 @@ public class OmemoExceptionsTest {
OmemoDevice mallory = new OmemoDevice(JidCreate.bareFrom("mallory@server.tld"), 9876);

UndecidedOmemoIdentityException u = new UndecidedOmemoIdentityException(alice);
assertTrue(u.getUntrustedDevices().contains(alice));
assertTrue(u.getUntrustedDevices().size() == 1);
assertTrue(u.getUndecidedDevices().contains(alice));
assertTrue(u.getUndecidedDevices().size() == 1);

UndecidedOmemoIdentityException v = new UndecidedOmemoIdentityException(bob);
v.getUntrustedDevices().add(mallory);
assertTrue(v.getUntrustedDevices().size() == 2);
assertTrue(v.getUntrustedDevices().contains(bob));
assertTrue(v.getUntrustedDevices().contains(mallory));
v.getUndecidedDevices().add(mallory);
assertTrue(v.getUndecidedDevices().size() == 2);
assertTrue(v.getUndecidedDevices().contains(bob));
assertTrue(v.getUndecidedDevices().contains(mallory));

u.getUntrustedDevices().add(bob);
u.getUndecidedDevices().add(bob);
u.join(v);
assertTrue(u.getUntrustedDevices().size() == 3);
assertTrue(u.getUndecidedDevices().size() == 3);
}

@Test


Loading…
Cancel
Save