From c680a19833efb406f7da1d1f6569b6e94be9e062 Mon Sep 17 00:00:00 2001 From: Jamorham Date: Wed, 23 Aug 2023 09:39:03 +0000 Subject: [PATCH] UIBased: filter improvements --- .../dexdrip/services/UiBasedCollector.java | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/services/UiBasedCollector.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/UiBasedCollector.java index 618701e0fc..b4daea6cf5 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/services/UiBasedCollector.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/UiBasedCollector.java @@ -2,7 +2,6 @@ import static com.eveningoutpost.dexdrip.models.JoH.msSince; import static com.eveningoutpost.dexdrip.cgm.dex.ClassifierAction.lastReadingTimestamp; -import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS; import static com.eveningoutpost.dexdrip.utils.DexCollectionType.UiBased; import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getDexCollectionType; import static com.eveningoutpost.dexdrip.xdrip.gs; @@ -210,20 +209,45 @@ String filterString(final String value) { if (lastPackage == null) return value; switch (lastPackage) { default: - return value - .replace("\u00a0"," ") - .replace("\u2060","") - .replace("\\","/") - .replace("mmol/L", "") - .replace("mmol/l", "") - .replace("mg/dL", "") - .replace("mg/dl", "") - .replace("≤", "") - .replace("≥", "") + return (basicFilterString(arrowFilterString(value))) .trim(); } } + String basicFilterString(final String value) { + return value + .replace("\u00a0"," ") + .replace("\u2060","") + .replace("\\","/") + .replace("mmol/L", "") + .replace("mmol/l", "") + .replace("mg/dL", "") + .replace("mg/dl", "") + .replace("≤", "") + .replace("≥", ""); + } + + String arrowFilterString(final String value) { + return filterUnicodeRange(filterUnicodeRange(filterUnicodeRange(filterUnicodeRange(value, + '\u2190', '\u21FF'), + '\u2700', '\u27BF'), + '\u2900', '\u297F'), + '\u2B00', '\u2BFF'); + } + + public String filterUnicodeRange(final String input, final char bottom, final char top) { + if (bottom > top) { + throw new RuntimeException("bottom and top of character range invalid"); + } + val filtered = new StringBuilder(input.length()); + for (final char c : input.toCharArray()) { + if (c < bottom || c > top) { + filtered.append(c); + } + } + return filtered.toString(); + } + @SuppressWarnings("UnnecessaryLocalVariable") private void processRemote(final RemoteViews cview) { if (cview == null) return;