diff --git a/app/src/main/java/us/spotco/malwarescanner/Database.java b/app/src/main/java/us/spotco/malwarescanner/Database.java index 1844da1..2448423 100644 --- a/app/src/main/java/us/spotco/malwarescanner/Database.java +++ b/app/src/main/java/us/spotco/malwarescanner/Database.java @@ -133,11 +133,17 @@ class Database { if (database.getName().contains(".hdb")) {//.hdb format: md5, size, name while ((line = reader.readLine()) != null) { String[] lineS = line.split(":"); + if(Utils.TRIM_VARIANT_NUMBER) { + lineS[2] = lineS[2].split("-")[0]; + } signaturesMD5.put(lineS[0].substring(0, Utils.MAX_HASH_LENGTH), lineS[2]); } } else if (database.getName().contains(".hsb")) {//.hsb format: sha256, size, name while ((line = reader.readLine()) != null) { String[] lineS = line.split(":"); + if(Utils.TRIM_VARIANT_NUMBER) { + lineS[2] = lineS[2].split("-")[0]; + } if (lineS[0].length() == 32) { signaturesSHA1.put(lineS[0].substring(0, Utils.MAX_HASH_LENGTH), lineS[2]); } else { diff --git a/app/src/main/java/us/spotco/malwarescanner/Utils.java b/app/src/main/java/us/spotco/malwarescanner/Utils.java index 995c653..e8ea25a 100644 --- a/app/src/main/java/us/spotco/malwarescanner/Utils.java +++ b/app/src/main/java/us/spotco/malwarescanner/Utils.java @@ -36,7 +36,9 @@ class Utils { public final static int MAX_SCAN_SIZE = (1000 * 1000) * 80; //80MB public final static int MAX_SCAN_SIZE_REALTIME = MAX_SCAN_SIZE / 2; //40MB - public final static int MAX_HASH_LENGTH = 16; + public final static int MAX_HASH_LENGTH = 12; + public final static boolean TRIM_VARIANT_NUMBER = true; + public static int FILES_SCANNED = 0; private static ThreadPoolExecutor threadPoolExecutor = null;