Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Merge pull request #155 from vanitasvitae/fixGetUndecidedDevices

Browse source 
Correct method name to getUndecidedDevices
This commit is contained in:
Florian Schmaus 2017-07-14 22:06:34 +02:00 committed by GitHub
commit c7630362ef
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
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; 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 * @param other other Exception
*/ */
public void join(UndecidedOmemoIdentityException other) { public void join(UndecidedOmemoIdentityException other) {
this.devices.addAll(other.getUntrustedDevices()); this.devices.addAll(other.getUndecidedDevices());
} }
} }

16
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); OmemoDevice mallory = new OmemoDevice(JidCreate.bareFrom("mallory@server.tld"), 9876);
UndecidedOmemoIdentityException u = new UndecidedOmemoIdentityException(alice); UndecidedOmemoIdentityException u = new UndecidedOmemoIdentityException(alice);
assertTrue(u.getUntrustedDevices().contains(alice)); assertTrue(u.getUndecidedDevices().contains(alice));
assertTrue(u.getUntrustedDevices().size() == 1); assertTrue(u.getUndecidedDevices().size() == 1);
UndecidedOmemoIdentityException v = new UndecidedOmemoIdentityException(bob); UndecidedOmemoIdentityException v = new UndecidedOmemoIdentityException(bob);
v.getUntrustedDevices().add(mallory); v.getUndecidedDevices().add(mallory);
assertTrue(v.getUntrustedDevices().size() == 2); assertTrue(v.getUndecidedDevices().size() == 2);
assertTrue(v.getUntrustedDevices().contains(bob)); assertTrue(v.getUndecidedDevices().contains(bob));
assertTrue(v.getUntrustedDevices().contains(mallory)); assertTrue(v.getUndecidedDevices().contains(mallory));
u.getUntrustedDevices().add(bob); u.getUndecidedDevices().add(bob);
u.join(v); u.join(v);
assertTrue(u.getUntrustedDevices().size() == 3); assertTrue(u.getUndecidedDevices().size() == 3);
} }
@Test @Test