From a9532d5ba636ea29407542eaf9202bd141341c41 Mon Sep 17 00:00:00 2001 From: xynngh Date: Fri, 23 Oct 2020 18:09:27 +0400 Subject: [PATCH] Make "pattern" the only required field for blacklist import --- CHANGELOG.md | 5 ++ .../data/BlacklistImporterExporter.java | 73 +++++++++++++------ 2 files changed, 54 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0d65fc..b2be4fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Changed + +- `ID` and `numberOfCalls` are now optional fields for blacklist import (`pattern` is the only required field now). + Fields after `pattern` may be omitted. + ### Fixed - Fixed importing blacklist files larger than 4000 bytes. diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/data/BlacklistImporterExporter.java b/app/src/main/java/dummydomain/yetanothercallblocker/data/BlacklistImporterExporter.java index b91c654..bd9f5c3 100644 --- a/app/src/main/java/dummydomain/yetanothercallblocker/data/BlacklistImporterExporter.java +++ b/app/src/main/java/dummydomain/yetanothercallblocker/data/BlacklistImporterExporter.java @@ -40,6 +40,13 @@ public class BlacklistImporterExporter { private static final String HEADER_NAME = "name"; private static final String HEADER_PATTERN = "pattern"; + private static final int INDEX_ID = 0; + private static final int INDEX_NAME = 1; + private static final int INDEX_PATTERN = 2; + private static final int INDEX_CREATION_DATE = 3; + private static final int INDEX_NUMBER_OF_CALLS = 4; + private static final int INDEX_LAST_CALL_DATE = 5; + public boolean writeBackup(Iterable blacklistItems, Appendable out) { try (CSVPrinter printer = CSVFormat.DEFAULT.print(out)) { printer.printRecord(HEADER_ID, HEADER_NAME, HEADER_PATTERN, @@ -152,7 +159,7 @@ public class BlacklistImporterExporter { if (iterator.hasNext()) { CSVRecord record = iterator.next(); - if (record.size() < 6) return false; + if (record.size() < INDEX_PATTERN + 1) return false; boolean foundHeader = checkYacbHeader(record); LOG.debug("isYacbBackup() found header={}", foundHeader); @@ -160,18 +167,25 @@ public class BlacklistImporterExporter { // check that the types match try { - Long.parseLong(record.get(0)); - - String creationTimestampString = record.get(3); - if (!TextUtils.isEmpty(creationTimestampString)) { - Long.parseLong(creationTimestampString); + if (!TextUtils.isEmpty(get(record, INDEX_ID))) { + Long.parseLong(get(record, INDEX_ID)); } - Integer.parseInt(record.get(4)); + if (!isValidPattern(cleanPattern(patternFromHumanReadable( + get(record, INDEX_PATTERN))))) { + return false; + } - String lastCallTimestampString = record.get(5); - if (!TextUtils.isEmpty(lastCallTimestampString)) { - Long.parseLong(lastCallTimestampString); + if (!TextUtils.isEmpty(get(record, INDEX_CREATION_DATE))) { + Long.parseLong(get(record, INDEX_CREATION_DATE)); + } + + if (!TextUtils.isEmpty(get(record, INDEX_NUMBER_OF_CALLS))) { + Integer.parseInt(get(record, INDEX_NUMBER_OF_CALLS)); + } + + if (!TextUtils.isEmpty(get(record, INDEX_LAST_CALL_DATE))) { + Long.parseLong(get(record, INDEX_LAST_CALL_DATE)); } } catch (Exception e) { LOG.debug("isYacbBackup() error parsing item", e); @@ -192,9 +206,9 @@ public class BlacklistImporterExporter { private boolean checkYacbHeader(CSVRecord record) { boolean foundHeader = false; try { - foundHeader = HEADER_ID.equals(record.get(0)) - && HEADER_NAME.equals(record.get(1)) - && HEADER_PATTERN.equals(record.get(2)); + foundHeader = HEADER_ID.equals(record.get(INDEX_ID)) + && HEADER_NAME.equals(record.get(INDEX_NAME)) + && HEADER_PATTERN.equals(record.get(INDEX_PATTERN)); } catch (Exception e) { LOG.warn("checkYacbHeader() error checking header", e); } @@ -224,23 +238,30 @@ public class BlacklistImporterExporter { boolean enough = false; try { - int i = 0; - item.setId(Long.valueOf(record.get(i++))); - item.setName(record.get(i++)); - item.setPattern(cleanPattern(patternFromHumanReadable(record.get(i++)))); + if (!TextUtils.isEmpty(get(record, INDEX_ID))) { + item.setId(Long.valueOf(get(record, INDEX_ID))); + } + + item.setName(record.get(INDEX_NAME)); + + item.setPattern(cleanPattern(patternFromHumanReadable( + record.get(INDEX_PATTERN)))); enough = true; - String creationTimestampString = record.get(i++); - if (!TextUtils.isEmpty(creationTimestampString)) { - item.setCreationDate(new Date(Long.parseLong(creationTimestampString))); + if (!TextUtils.isEmpty(get(record, INDEX_CREATION_DATE))) { + item.setCreationDate(new Date(Long.parseLong( + get(record, INDEX_CREATION_DATE)))); } - item.setNumberOfCalls(Integer.parseInt(record.get(i++))); + if (!TextUtils.isEmpty(get(record, INDEX_NUMBER_OF_CALLS))) { + item.setNumberOfCalls(Integer.parseInt( + get(record, INDEX_NUMBER_OF_CALLS))); + } - String lastCallTimestampString = record.get(i); - if (!TextUtils.isEmpty(lastCallTimestampString)) { - item.setLastCallDate(new Date(Long.parseLong(lastCallTimestampString))); + if (!TextUtils.isEmpty(get(record, INDEX_LAST_CALL_DATE))) { + item.setLastCallDate(new Date(Long.parseLong( + get(record, INDEX_LAST_CALL_DATE)))); } } catch (Exception e) { LOG.warn("readYacbBackup() error parsing item", e); @@ -259,6 +280,10 @@ public class BlacklistImporterExporter { } } + private static String get(CSVRecord record, int index) { + return record.size() > index ? record.get(index) : null; + } + public boolean isNoPhoneSpamBackup(Reader in) { try { BufferedReader br = new BufferedReader(in); // do NOT close