From 71cc9157a70a7609cbe3ba84aa02f2f2b7441f23 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 25 Dec 2023 14:39:48 -0500
Subject: [PATCH] Fixup signature count miscalculation when database already
 loaded

Signed-off-by: Tad <tad@spotco.us>
---
 app/build.gradle                                         | 4 ++--
 app/src/main/java/us/spotco/malwarescanner/Database.java | 2 ++
 fastlane/metadata/android/en-US/changelogs/120.txt       | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/120.txt

diff --git a/app/build.gradle b/app/build.gradle
index d433fa6..127ff2c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "us.spotco.malwarescanner"
         minSdkVersion 19
         targetSdkVersion 32
-        versionCode 119
-        versionName "2.39"
+        versionCode 120
+        versionName "2.40"
         resConfigs 'en', 'af', 'de', 'el', 'es', 'fi', 'fr', 'it', 'pl', 'pt', 'ru', 'tr', 'zh-rCN'
     }
     buildTypes {
diff --git a/app/src/main/java/us/spotco/malwarescanner/Database.java b/app/src/main/java/us/spotco/malwarescanner/Database.java
index b0ff6dc..dd72bf3 100644
--- a/app/src/main/java/us/spotco/malwarescanner/Database.java
+++ b/app/src/main/java/us/spotco/malwarescanner/Database.java
@@ -99,6 +99,7 @@ class Database {
         databasePath.mkdir();
 
         signatureDatabases.clear();
+        signaturesCount = 0;
         prefs = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE);
         String baseURL = Utils.getDatabaseURL(context);
         signatureDatabases.add(new SignatureDatabase(baseURL, "hypatia-md5-bloom.bin"));
@@ -111,6 +112,7 @@ class Database {
             databaseFullyLoaded = false;
             databaseCurrentlyLoading = true;
             initDatabase(context);
+            signaturesCount = 0;
             File publicKey = new File(databasePath + "/gpg.key");
             GPGDetachedSignatureVerifier verifier = new GPGDetachedSignatureVerifier(Utils.getSigningKey(context));
             for (SignatureDatabase database : signatureDatabases) {
diff --git a/fastlane/metadata/android/en-US/changelogs/120.txt b/fastlane/metadata/android/en-US/changelogs/120.txt
new file mode 100644
index 0000000..0f33ce1
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/120.txt
@@ -0,0 +1 @@
+* Fixup signature count miscalculation when database already loaded