From 419f6a336e24ca4effbde09b24f6c74122cd9fb9 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Fri, 14 Jul 2017 16:09:37 +0200 Subject: [PATCH] Correct method name to getUndecidedDevices --- .../UndecidedOmemoIdentityException.java | 10 +++++----- .../smack/omemo/OmemoExceptionsTest.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UndecidedOmemoIdentityException.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UndecidedOmemoIdentityException.java index f7511445f..b477f539a 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UndecidedOmemoIdentityException.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UndecidedOmemoIdentityException.java @@ -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 getUntrustedDevices() { + public HashSet 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()); } } diff --git a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoExceptionsTest.java b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoExceptionsTest.java index 2de3a1505..e78f31630 100644 --- a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoExceptionsTest.java +++ b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoExceptionsTest.java @@ -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