bcarrella
/
YetAnotherCallBlocker
mirror of https://gitlab.com/xynngh/YetAnotherCallBlocker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make "pattern" the only required field for blacklist import

This commit is contained in:
xynngh 2020-10-23 18:09:27 +04:00
parent 88ee6b2634
commit a9532d5ba6
2 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased] ## [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
- Fixed importing blacklist files larger than 4000 bytes. - Fixed importing blacklist files larger than 4000 bytes.

73
app/src/main/java/dummydomain/yetanothercallblocker/data/BlacklistImporterExporter.java
View File

@ -40,6 +40,13 @@ public class BlacklistImporterExporter {
private static final String HEADER_NAME = "name"; private static final String HEADER_NAME = "name";
private static final String HEADER_PATTERN = "pattern"; 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<BlacklistItem> blacklistItems, Appendable out) { public boolean writeBackup(Iterable<BlacklistItem> blacklistItems, Appendable out) {
try (CSVPrinter printer = CSVFormat.DEFAULT.print(out)) { try (CSVPrinter printer = CSVFormat.DEFAULT.print(out)) {
printer.printRecord(HEADER_ID, HEADER_NAME, HEADER_PATTERN, printer.printRecord(HEADER_ID, HEADER_NAME, HEADER_PATTERN,
@ -152,7 +159,7 @@ public class BlacklistImporterExporter {
if (iterator.hasNext()) { if (iterator.hasNext()) {
CSVRecord record = iterator.next(); CSVRecord record = iterator.next();
if (record.size() < 6) return false; if (record.size() < INDEX_PATTERN + 1) return false;
boolean foundHeader = checkYacbHeader(record); boolean foundHeader = checkYacbHeader(record);
LOG.debug("isYacbBackup() found header={}", foundHeader); LOG.debug("isYacbBackup() found header={}", foundHeader);
@ -160,18 +167,25 @@ public class BlacklistImporterExporter {
// check that the types match // check that the types match
try { try {
Long.parseLong(record.get(0)); if (!TextUtils.isEmpty(get(record, INDEX_ID))) {
Long.parseLong(get(record, INDEX_ID));
String creationTimestampString = record.get(3);
if (!TextUtils.isEmpty(creationTimestampString)) {
Long.parseLong(creationTimestampString);
} }
Integer.parseInt(record.get(4)); if (!isValidPattern(cleanPattern(patternFromHumanReadable(
get(record, INDEX_PATTERN))))) {
return false;
}
String lastCallTimestampString = record.get(5); if (!TextUtils.isEmpty(get(record, INDEX_CREATION_DATE))) {
if (!TextUtils.isEmpty(lastCallTimestampString)) { Long.parseLong(get(record, INDEX_CREATION_DATE));
Long.parseLong(lastCallTimestampString); }
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) { } catch (Exception e) {
LOG.debug("isYacbBackup() error parsing item", e); LOG.debug("isYacbBackup() error parsing item", e);
@ -192,9 +206,9 @@ public class BlacklistImporterExporter {
private boolean checkYacbHeader(CSVRecord record) { private boolean checkYacbHeader(CSVRecord record) {
boolean foundHeader = false; boolean foundHeader = false;
try { try {
foundHeader = HEADER_ID.equals(record.get(0)) foundHeader = HEADER_ID.equals(record.get(INDEX_ID))
&& HEADER_NAME.equals(record.get(1)) && HEADER_NAME.equals(record.get(INDEX_NAME))
&& HEADER_PATTERN.equals(record.get(2)); && HEADER_PATTERN.equals(record.get(INDEX_PATTERN));
} catch (Exception e) { } catch (Exception e) {
LOG.warn("checkYacbHeader() error checking header", e); LOG.warn("checkYacbHeader() error checking header", e);
} }
@ -224,23 +238,30 @@ public class BlacklistImporterExporter {
boolean enough = false; boolean enough = false;
try { try {
int i = 0; if (!TextUtils.isEmpty(get(record, INDEX_ID))) {
item.setId(Long.valueOf(record.get(i++))); item.setId(Long.valueOf(get(record, INDEX_ID)));
item.setName(record.get(i++)); }
item.setPattern(cleanPattern(patternFromHumanReadable(record.get(i++))));
item.setName(record.get(INDEX_NAME));
item.setPattern(cleanPattern(patternFromHumanReadable(
record.get(INDEX_PATTERN))));
enough = true; enough = true;
String creationTimestampString = record.get(i++); if (!TextUtils.isEmpty(get(record, INDEX_CREATION_DATE))) {
if (!TextUtils.isEmpty(creationTimestampString)) { item.setCreationDate(new Date(Long.parseLong(
item.setCreationDate(new Date(Long.parseLong(creationTimestampString))); 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(get(record, INDEX_LAST_CALL_DATE))) {
if (!TextUtils.isEmpty(lastCallTimestampString)) { item.setLastCallDate(new Date(Long.parseLong(
item.setLastCallDate(new Date(Long.parseLong(lastCallTimestampString))); get(record, INDEX_LAST_CALL_DATE))));
} }
} catch (Exception e) { } catch (Exception e) {
LOG.warn("readYacbBackup() error parsing item", 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) { public boolean isNoPhoneSpamBackup(Reader in) {
try { try {
BufferedReader br = new BufferedReader(in); // do NOT close BufferedReader br = new BufferedReader(in); // do NOT close