X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMisc.java;h=197fe6d0d1fbbc2645ef7666c2f332bcd01e2c29;hb=7b69e8ac1f28fa103c0552fed8d9c05da5f6fe56;hp=927a34d936b44326cfeed93aa9866ccd64ff770f;hpb=b0404689e0dbb2b08f02deca7ee5d14636a3baa6;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/Misc.java b/app/src/main/java/net/ktnx/mobileledger/utils/Misc.java index 927a34d9..197fe6d0 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Misc.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Misc.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -32,6 +32,7 @@ public class Misc { public static boolean isZero(float f) { return (f < 0.005) && (f > -0.005); } + public static boolean equalFloats(float a, float b) { return isZero(a - b); } public static void showSoftKeyboard(Activity activity) { // make the keyboard appear Configuration cf = activity.getResources() @@ -61,7 +62,7 @@ public class Misc { } public static String emptyIsNull(String str) { - return "".equals(str) ? null : str; + return str != null && str.isEmpty() ? null : str; } public static String nullIsEmpty(String str) { return (str == null) ? "" : str; @@ -85,15 +86,19 @@ public class Misc { } @Contract(value = "null, null -> true; null, !null -> false; !null, null -> false", pure = true) public static boolean equalIntegers(Integer a, Integer b) { - if ( a == null && b == null) return true; - if (a == null || b == null) return false; + if (a == null && b == null) + return true; + if (a == null || b == null) + return false; return a.equals(b); } @Contract(value = "null, null -> true; null, !null -> false; !null, null -> false", pure = true) public static boolean equalLongs(Long a, Long b) { - if ( a == null && b == null) return true; - if (a == null || b == null) return false; + if (a == null && b == null) + return true; + if (a == null || b == null) + return false; return a.equals(b); }