diff --git a/src/main/java/org/mtransit/android/commons/StringUtils.java b/src/main/java/org/mtransit/android/commons/StringUtils.java index 0815a68a..b2909ed1 100644 --- a/src/main/java/org/mtransit/android/commons/StringUtils.java +++ b/src/main/java/org/mtransit/android/commons/StringUtils.java @@ -7,13 +7,10 @@ import androidx.annotation.Nullable; import androidx.annotation.PluralsRes; import androidx.annotation.StringRes; -import androidx.core.util.ObjectsCompat; - -import org.mtransit.android.commons.api.SupportFactory; import java.util.regex.Pattern; -@SuppressWarnings({"unused", "WeakerAccess"}) +@SuppressWarnings("WeakerAccess") public final class StringUtils implements MTLog.Loggable { private static final String LOG_TAG = StringUtils.class.getSimpleName(); @@ -24,6 +21,7 @@ public String getLogTag() { return LOG_TAG; } + @SuppressWarnings("unused") public static final char EMPTY_CAR = 0; public static final String EMPTY = ""; @@ -38,6 +36,7 @@ public String getLogTag() { private static final Pattern DUPLICATE_WHITESPACES = Pattern.compile("\\s{2,}"); + @SuppressWarnings("unused") @Nullable public static String oneLine(@Nullable String string) { if (string == null || string.isEmpty()) { @@ -46,6 +45,7 @@ public static String oneLine(@Nullable String string) { return ONE_LINE.matcher(string).replaceAll(SPACE_STRING); } + @SuppressWarnings("unused") @Nullable public static String removeDuplicateWhitespaces(@Nullable String string) { if (string == null || string.isEmpty()) { @@ -72,7 +72,6 @@ public static String ellipsize(@Nullable String string, int size) { return string.substring(0, size - ELLIPSIZE.length()) + ELLIPSIZE; } - @NonNull public static String ellipsizeNN(@NonNull String string, int size) { if (string.length() < size) { @@ -89,11 +88,7 @@ public static String trim(@Nullable String string) { return string.trim(); } - public static boolean equals(@Nullable String str1, @Nullable String str2) { - return ObjectsCompat.equals(str1, str2); - } - - public static boolean equalsAlphabeticsAndDigits(@Nullable String str1, @Nullable String str2) { + public static boolean equalsAlphabeticAndDigits(@Nullable String str1, @Nullable String str2) { if (str1 == null) { return str2 == null; } else if (str2 == null) { @@ -109,8 +104,8 @@ public static boolean equalsAlphabeticsAndDigits(@Nullable String str1, @Nullabl for (int i = 0; i < str1Count; ++i) { char c1 = str1.charAt(i); char c2 = str2.charAt(i); - if ((SupportFactory.get().isCharacterAlphabetic(c1) || Character.isDigit(c1)) // - && (SupportFactory.get().isCharacterAlphabetic(c2) || Character.isDigit(c2))) { + if ((Character.isAlphabetic(c1) || Character.isDigit(c1)) // + && (Character.isAlphabetic(c2) || Character.isDigit(c2))) { if (c1 != c2 && foldCase(c1) != foldCase(c2)) { return false; } @@ -147,10 +142,11 @@ public static boolean isDigitsOnly(@NonNull CharSequence str, boolean allowWhite return true; } - public static boolean isAlphabeticsOnly(@NonNull CharSequence str, boolean allowWhitespace) { + @SuppressWarnings("unused") + public static boolean isAlphabeticOnly(@NonNull CharSequence str, boolean allowWhitespace) { final int len = str.length(); for (int i = 0; i < len; i++) { - if (!SupportFactory.get().isCharacterAlphabetic(str.charAt(i))) { + if (!Character.isAlphabetic(str.charAt(i))) { if (allowWhitespace && Character.isWhitespace(str.charAt(i))) { continue; } @@ -170,6 +166,7 @@ private static char foldCase(char ch) { return Character.toLowerCase(Character.toUpperCase(ch)); } + @SuppressWarnings("unused") public static boolean equalsIgnoreCase(@Nullable String str1, @Nullable String str2) { return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2); } @@ -186,6 +183,7 @@ public static int getPluralsIdentifier(@NonNull Context context, @NonNull String return context.getResources().getIdentifier(name, "plurals", context.getPackageName()); } + @SuppressWarnings("unused") @NonNull public static String getEmptyOrPlurals(@NonNull Context context, int emptyRes, int pluralsRes, int quantity) { if (quantity == 0) { @@ -204,6 +202,7 @@ public static String getEmptyOrPluralsIdentifier(@NonNull Context context, @NonN } } + @SuppressWarnings("unused") @Nullable public static String removeNewLine(@Nullable String string) { if (string == null) { @@ -212,6 +211,7 @@ public static String removeNewLine(@Nullable String string) { return string.replaceAll("[\n\r]", EMPTY); } + @SuppressWarnings("unused") @Nullable public static String removeStartWith(@Nullable String string, @Nullable String[] removeChars) { if (string == null || string.isEmpty()) { @@ -227,6 +227,7 @@ public static String removeStartWith(@Nullable String string, @Nullable String[] return string; } + @SuppressWarnings("unused") @Nullable public static String replaceStartWith(@Nullable String string, @Nullable String[] removeChars, @NonNull String replacement) { if (string == null || string.isEmpty()) { @@ -242,6 +243,7 @@ public static String replaceStartWith(@Nullable String string, @Nullable String[ return string; } + @SuppressWarnings("unused") @Nullable public static String removeStartWith(@Nullable String string, @Nullable String[] removeChars, int keepLast) { if (string == null || string.isEmpty()) { @@ -272,9 +274,7 @@ public static String replaceAll(@Nullable String string, @Nullable String[] repl @NonNull public static String replaceAll(@NonNull String string, @Nullable Pattern[] patterns, @NonNull String replacement) { - if (string.isEmpty()) { - return string; - } + if (string.isEmpty()) return string; if (patterns != null) { for (Pattern pattern : patterns) { string = pattern.matcher(string).replaceAll(replacement); @@ -283,13 +283,12 @@ public static String replaceAll(@NonNull String string, @Nullable Pattern[] patt return string; } + @SuppressWarnings("unused") public static boolean isUppercaseOnly(@Nullable CharSequence str, boolean allowWhitespace, boolean checkAZOnly) { - if (str == null || str.length() == 0) { - return false; - } + if (str == null || str.length() == 0) return false; final int len = str.length(); for (int i = 0; i < len; i++) { - if (checkAZOnly && !SupportFactory.get().isCharacterAlphabetic(str.charAt(i))) { + if (checkAZOnly && !Character.isAlphabetic(str.charAt(i))) { continue; } if (!Character.isUpperCase(str.charAt(i))) { diff --git a/src/main/java/org/mtransit/android/commons/api/BaklavaAndroid16Support.java b/src/main/java/org/mtransit/android/commons/api/BaklavaAndroid16Support.java deleted file mode 100644 index 4cb78691..00000000 --- a/src/main/java/org/mtransit/android/commons/api/BaklavaAndroid16Support.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.BAKLAVA) -public class BaklavaAndroid16Support extends VanillaIceCreamAndroid15Support { - - private static final String LOG_TAG = BaklavaAndroid16Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/NougatSupport.java b/src/main/java/org/mtransit/android/commons/api/NougatSupport.java deleted file mode 100644 index 12a9f501..00000000 --- a/src/main/java/org/mtransit/android/commons/api/NougatSupport.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.annotation.SuppressLint; -import android.annotation.TargetApi; -import android.app.Activity; -import android.graphics.drawable.Drawable; -import android.os.Build; -import android.view.Display; -import android.view.View; -import android.view.WindowManager; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; - -import java.util.Objects; - -@SuppressWarnings("WeakerAccess") -@SuppressLint("ObsoleteSdkInt") // Always >= 24 (minSDK) -@RequiresApi(Build.VERSION_CODES.N) -public class NougatSupport implements SupportUtil { - - private static final String LOG_TAG = NougatSupport.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } - - @Override - public boolean isCharacterAlphabetic(int codePoint) { - return Character.isAlphabetic(codePoint); - } - - @NonNull - @Override - public T requireNonNull(@Nullable T obj, @NonNull String message) { - return Objects.requireNonNull(obj, message); - } - - @Override - public boolean equals(@Nullable Object a, @Nullable Object b) { - return Objects.equals(a, b); - } - - @Override - public void setBackground(@NonNull View view, @Nullable Drawable background) { - view.setBackground(background); - } - - @Nullable - @Override - public Display getDefaultDisplay(@NonNull Activity activity) { - final WindowManager windowManager = activity.getWindowManager(); - return windowManager == null ? null : windowManager.getDefaultDisplay(); - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/NougatSupportMR1.java b/src/main/java/org/mtransit/android/commons/api/NougatSupportMR1.java deleted file mode 100644 index 3db9f16c..00000000 --- a/src/main/java/org/mtransit/android/commons/api/NougatSupportMR1.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@RequiresApi(Build.VERSION_CODES.N_MR1) -public class NougatSupportMR1 extends NougatSupport { - - private static final String LOG_TAG = NougatSupportMR1.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/OreoSupport.java b/src/main/java/org/mtransit/android/commons/api/OreoSupport.java deleted file mode 100644 index 0b8e3dd2..00000000 --- a/src/main/java/org/mtransit/android/commons/api/OreoSupport.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@RequiresApi(Build.VERSION_CODES.O) -public class OreoSupport extends NougatSupportMR1 { - - private static final String LOG_TAG = OreoSupport.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/OreoSupportMR1.java b/src/main/java/org/mtransit/android/commons/api/OreoSupportMR1.java deleted file mode 100644 index 16961121..00000000 --- a/src/main/java/org/mtransit/android/commons/api/OreoSupportMR1.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@RequiresApi(Build.VERSION_CODES.O_MR1) -public class OreoSupportMR1 extends OreoSupport { - - private static final String LOG_TAG = OreoSupportMR1.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/PieSupport.java b/src/main/java/org/mtransit/android/commons/api/PieSupport.java deleted file mode 100644 index bcf0d821..00000000 --- a/src/main/java/org/mtransit/android/commons/api/PieSupport.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@RequiresApi(Build.VERSION_CODES.P) -public class PieSupport extends OreoSupportMR1 { - - private static final String LOG_TAG = PieSupport.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/QAndroid10Support.java b/src/main/java/org/mtransit/android/commons/api/QAndroid10Support.java deleted file mode 100644 index aae0d742..00000000 --- a/src/main/java/org/mtransit/android/commons/api/QAndroid10Support.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.Q) -public class QAndroid10Support extends PieSupport { - - private static final String LOG_TAG = QAndroid10Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/RAndroid11Support.java b/src/main/java/org/mtransit/android/commons/api/RAndroid11Support.java deleted file mode 100644 index 3c73eb39..00000000 --- a/src/main/java/org/mtransit/android/commons/api/RAndroid11Support.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.app.Activity; -import android.os.Build; -import android.view.Display; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.R) -public class RAndroid11Support extends QAndroid10Support { - - private static final String LOG_TAG = RAndroid11Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } - - @Nullable - @Override - public Display getDefaultDisplay(@NonNull Activity activity) { - return activity.getDisplay(); - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/SAndroid12Support.java b/src/main/java/org/mtransit/android/commons/api/SAndroid12Support.java deleted file mode 100644 index 7496f12f..00000000 --- a/src/main/java/org/mtransit/android/commons/api/SAndroid12Support.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.S) -public class SAndroid12Support extends RAndroid11Support { - - private static final String LOG_TAG = SAndroid12Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/SV2Android12Support.java b/src/main/java/org/mtransit/android/commons/api/SV2Android12Support.java deleted file mode 100644 index 2acf9b61..00000000 --- a/src/main/java/org/mtransit/android/commons/api/SV2Android12Support.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.S_V2) -public class SV2Android12Support extends SAndroid12Support { - - private static final String LOG_TAG = SV2Android12Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/SupportFactory.java b/src/main/java/org/mtransit/android/commons/api/SupportFactory.java deleted file mode 100644 index e1af3ce0..00000000 --- a/src/main/java/org/mtransit/android/commons/api/SupportFactory.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import org.mtransit.android.commons.MTLog; - -public class SupportFactory implements MTLog.Loggable { - - private static final String LOG_TAG = SupportFactory.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } - - @Nullable - private static SupportUtil instance; - - @NonNull - public static SupportUtil get() { - if (instance == null) { - final Package thePackage = SupportFactory.class.getPackage(); - if (thePackage == null) { - MTLog.e(LOG_TAG, "Can NOT get support factory package!"); - throw new RuntimeException("Can NOT get support factory package!"); - } - String className = thePackage.getName(); - switch (Build.VERSION.SDK_INT) { - case Build.VERSION_CODES.BASE: // unsupported versions - case Build.VERSION_CODES.BASE_1_1: - case Build.VERSION_CODES.CUPCAKE: - case Build.VERSION_CODES.DONUT: - case Build.VERSION_CODES.ECLAIR: - case Build.VERSION_CODES.ECLAIR_0_1: - case Build.VERSION_CODES.ECLAIR_MR1: - case Build.VERSION_CODES.FROYO: - case Build.VERSION_CODES.GINGERBREAD: - case Build.VERSION_CODES.GINGERBREAD_MR1: - case Build.VERSION_CODES.HONEYCOMB: - case Build.VERSION_CODES.HONEYCOMB_MR1: - case Build.VERSION_CODES.HONEYCOMB_MR2: - case Build.VERSION_CODES.ICE_CREAM_SANDWICH: - case Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1: - case Build.VERSION_CODES.JELLY_BEAN: - case Build.VERSION_CODES.JELLY_BEAN_MR1: - case Build.VERSION_CODES.JELLY_BEAN_MR2: - case Build.VERSION_CODES.KITKAT: - case Build.VERSION_CODES.KITKAT_WATCH: // not really supporting this - case Build.VERSION_CODES.LOLLIPOP: - case Build.VERSION_CODES.LOLLIPOP_MR1: - case Build.VERSION_CODES.M: - MTLog.d(LOG_TAG, "Unknown API Level: " + Build.VERSION.SDK_INT); - break; - case Build.VERSION_CODES.N: - className += ".NougatSupport"; // 24 - break; - case Build.VERSION_CODES.N_MR1: - className += ".NougatSupportMR1"; // 25 - break; - case Build.VERSION_CODES.O: - className += ".OreoSupport"; // 26 - break; - case Build.VERSION_CODES.O_MR1: - className += ".OreoSupportMR1"; // 27 - break; - case Build.VERSION_CODES.P: - className += ".PieSupport"; // 28 - break; - case Build.VERSION_CODES.Q: - className += ".QAndroid10Support"; // 29 - break; - case Build.VERSION_CODES.R: - className += ".RAndroid11Support"; // 30 - break; - case Build.VERSION_CODES.S: - className += ".SAndroid12Support"; // 31 - break; - case Build.VERSION_CODES.S_V2: - className += ".SV2Android12Support"; // 32 - break; - case Build.VERSION_CODES.TIRAMISU: - className += ".TiramisuAndroid13Support"; // 33 - break; - case Build.VERSION_CODES.UPSIDE_DOWN_CAKE: - className += ".UpsideDownCakeAndroid14Support"; // 34 - break; - case Build.VERSION_CODES.VANILLA_ICE_CREAM: - className += ".VanillaIceCreamAndroid15Support"; // 35 - break; - case Build.VERSION_CODES.BAKLAVA: // 36 - className += ".BaklavaAndroid16Support"; // 36 - break; - default: - MTLog.w(LOG_TAG, "Unknown API Level: %s", Build.VERSION.SDK_INT); - className += ".BaklavaAndroid16Support"; // default for newer SDK - break; - } - try { - Class detectorClass = Class.forName(className); - instance = (SupportUtil) detectorClass.getConstructor().newInstance(); - } catch (Exception e) { - MTLog.e(LOG_TAG, e, "INTERNAL ERROR!"); - throw new RuntimeException(e); - } - } - return instance; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/SupportUtil.java b/src/main/java/org/mtransit/android/commons/api/SupportUtil.java deleted file mode 100644 index a11f5b81..00000000 --- a/src/main/java/org/mtransit/android/commons/api/SupportUtil.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.app.Activity; -import android.graphics.drawable.Drawable; -import android.view.Display; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import org.mtransit.android.commons.MTLog; - -public interface SupportUtil extends MTLog.Loggable { - - void setBackground(@NonNull View view, @Nullable Drawable background); - - boolean isCharacterAlphabetic(int codePoint); - - @SuppressWarnings("UnusedReturnValue") - @NonNull - T requireNonNull(@Nullable T obj, @NonNull String message); - - @Nullable - Display getDefaultDisplay(@NonNull Activity activity); - - boolean equals(@Nullable Object a, @Nullable Object b); -} \ No newline at end of file diff --git a/src/main/java/org/mtransit/android/commons/api/TiramisuAndroid13Support.java b/src/main/java/org/mtransit/android/commons/api/TiramisuAndroid13Support.java deleted file mode 100644 index 4d421140..00000000 --- a/src/main/java/org/mtransit/android/commons/api/TiramisuAndroid13Support.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.TIRAMISU) -public class TiramisuAndroid13Support extends SV2Android12Support { - - private static final String LOG_TAG = TiramisuAndroid13Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/UpsideDownCakeAndroid14Support.java b/src/main/java/org/mtransit/android/commons/api/UpsideDownCakeAndroid14Support.java deleted file mode 100644 index 419e3dc5..00000000 --- a/src/main/java/org/mtransit/android/commons/api/UpsideDownCakeAndroid14Support.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) -public class UpsideDownCakeAndroid14Support extends TiramisuAndroid13Support { - - private static final String LOG_TAG = UpsideDownCakeAndroid14Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/api/VanillaIceCreamAndroid15Support.java b/src/main/java/org/mtransit/android/commons/api/VanillaIceCreamAndroid15Support.java deleted file mode 100644 index 9ebaff96..00000000 --- a/src/main/java/org/mtransit/android/commons/api/VanillaIceCreamAndroid15Support.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.mtransit.android.commons.api; - -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; - -@SuppressWarnings("unused") -@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) -public class VanillaIceCreamAndroid15Support extends UpsideDownCakeAndroid14Support { - - private static final String LOG_TAG = VanillaIceCreamAndroid15Support.class.getSimpleName(); - - @NonNull - @Override - public String getLogTag() { - return LOG_TAG; - } -} diff --git a/src/main/java/org/mtransit/android/commons/data/DefaultPOI.java b/src/main/java/org/mtransit/android/commons/data/DefaultPOI.java index 43481279..197eb7fa 100644 --- a/src/main/java/org/mtransit/android/commons/data/DefaultPOI.java +++ b/src/main/java/org/mtransit/android/commons/data/DefaultPOI.java @@ -15,13 +15,13 @@ import org.mtransit.android.commons.CursorExtKt; import org.mtransit.android.commons.HtmlUtils; import org.mtransit.android.commons.MTLog; -import org.mtransit.android.commons.StringUtils; import org.mtransit.android.commons.data.DataSourceTypeId.DataSourceType; import org.mtransit.android.commons.provider.poi.POIProviderContract; import org.mtransit.commons.CommonsApp; import java.text.Normalizer; import java.util.Locale; +import java.util.Objects; public class DefaultPOI implements POI { @@ -87,7 +87,7 @@ public boolean equals(Object o) { return false; } //noinspection RedundantIfStatement - if (!StringUtils.equals(this.getName(), otherPOI.getName())) { + if (!Objects.equals(this.getName(), otherPOI.getName())) { return false; } return true; diff --git a/src/main/java/org/mtransit/android/commons/data/Direction.java b/src/main/java/org/mtransit/android/commons/data/Direction.java index 29f14c42..4b388707 100644 --- a/src/main/java/org/mtransit/android/commons/data/Direction.java +++ b/src/main/java/org/mtransit/android/commons/data/Direction.java @@ -224,7 +224,7 @@ public static boolean isSameHeadsign(@Nullable String stringHeadsign1, @Nullable } else if (stringHeadsign2Empty) { return false; // not the same } - return StringUtils.equalsAlphabeticsAndDigits(stringHeadsign1, stringHeadsign2); + return StringUtils.equalsAlphabeticAndDigits(stringHeadsign1, stringHeadsign2); } @NonNull diff --git a/src/main/java/org/mtransit/android/commons/data/Route.java b/src/main/java/org/mtransit/android/commons/data/Route.java index 8a5149c8..42cbc80d 100644 --- a/src/main/java/org/mtransit/android/commons/data/Route.java +++ b/src/main/java/org/mtransit/android/commons/data/Route.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Comparator; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -123,14 +124,14 @@ public boolean equals(Object o) { if (getId() != otherRoute.getId()) { return false; } - if (!StringUtils.equals(getShortName(), otherRoute.getShortName())) { + if (!Objects.equals(getShortName(), otherRoute.getShortName())) { return false; } - if (!StringUtils.equals(getLongName(), otherRoute.getLongName())) { + if (!Objects.equals(getLongName(), otherRoute.getLongName())) { return false; } //noinspection RedundantIfStatement - if (!StringUtils.equals(getColor(), otherRoute.getColor())) { + if (!Objects.equals(getColor(), otherRoute.getColor())) { return false; } return true; @@ -218,6 +219,7 @@ public String getUUID() { return this.uuid; } + @SuppressWarnings("unused") public void resetUUID() { this.uuid = null; } diff --git a/src/main/java/org/mtransit/android/commons/provider/OCTranspoProvider.java b/src/main/java/org/mtransit/android/commons/provider/OCTranspoProvider.java index ff34b3c2..2d4d37f4 100644 --- a/src/main/java/org/mtransit/android/commons/provider/OCTranspoProvider.java +++ b/src/main/java/org/mtransit/android/commons/provider/OCTranspoProvider.java @@ -27,7 +27,6 @@ import org.mtransit.android.commons.PreferenceUtils; import org.mtransit.android.commons.R; import org.mtransit.android.commons.SqlUtils; -import org.mtransit.android.commons.StringUtils; import org.mtransit.android.commons.ThreadSafeDateFormatter; import org.mtransit.android.commons.TimeUtils; import org.mtransit.android.commons.UriUtils; @@ -79,6 +78,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; @@ -481,12 +481,12 @@ private JRouteDirection selectDirection(@NonNull RouteDirectionStop rds, String } JRouteDirection theJRouteDirection = null; for (JRouteDirection jRouteDirection : jRouteDirections) { - if (StringUtils.equals(jRouteDirection.jRouteLabel, tripHeading)) { + if (Objects.equals(jRouteDirection.jRouteLabel, tripHeading)) { theJRouteDirection = jRouteDirection; break; } for (JTrip jTrip : jRouteDirection.getJTripList()) { - if (StringUtils.equals(jTrip.jTripDestination, tripHeading)) { + if (Objects.equals(jTrip.jTripDestination, tripHeading)) { theJRouteDirection = jRouteDirection; break; }