From ca7529c1920acaa1ec1226d2cedaa6a15c70a43a Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sun, 4 Aug 2019 23:03:42 +0200 Subject: [PATCH] Use Integer.compare(int, int) now that we are on Android 19 --- .../main/java/org/jivesoftware/smack/sasl/SASLMechanism.java | 3 +-- .../smackx/disco/DiscoInfoLookupShortcutMechanism.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java index e86229078..bfd13958e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java @@ -257,9 +257,8 @@ public abstract class SASLMechanism implements Comparable { @Override public final int compareTo(SASLMechanism other) { - // Switch to Integer.compare(int, int) once Smack is on Android 19 or higher. Integer ourPriority = getPriority(); - return ourPriority.compareTo(other.getPriority()); + return Integer.compare(ourPriority, other.getPriority()); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/DiscoInfoLookupShortcutMechanism.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/DiscoInfoLookupShortcutMechanism.java index 1404f97e8..eaf525f11 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/DiscoInfoLookupShortcutMechanism.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/DiscoInfoLookupShortcutMechanism.java @@ -47,8 +47,7 @@ public abstract class DiscoInfoLookupShortcutMechanism implements Comparable