Fixup signature count miscalculation when database already loaded

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-12-25 14:39:48 -05:00
parent ee3b4fed72
commit 71cc9157a7
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
3 changed files with 5 additions and 2 deletions

View file

@ -6,8 +6,8 @@ android {
applicationId "us.spotco.malwarescanner" applicationId "us.spotco.malwarescanner"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 32 targetSdkVersion 32
versionCode 119 versionCode 120
versionName "2.39" versionName "2.40"
resConfigs 'en', 'af', 'de', 'el', 'es', 'fi', 'fr', 'it', 'pl', 'pt', 'ru', 'tr', 'zh-rCN' resConfigs 'en', 'af', 'de', 'el', 'es', 'fi', 'fr', 'it', 'pl', 'pt', 'ru', 'tr', 'zh-rCN'
} }
buildTypes { buildTypes {

View file

@ -99,6 +99,7 @@ class Database {
databasePath.mkdir(); databasePath.mkdir();
signatureDatabases.clear(); signatureDatabases.clear();
signaturesCount = 0;
prefs = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE); prefs = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE);
String baseURL = Utils.getDatabaseURL(context); String baseURL = Utils.getDatabaseURL(context);
signatureDatabases.add(new SignatureDatabase(baseURL, "hypatia-md5-bloom.bin")); signatureDatabases.add(new SignatureDatabase(baseURL, "hypatia-md5-bloom.bin"));
@ -111,6 +112,7 @@ class Database {
databaseFullyLoaded = false; databaseFullyLoaded = false;
databaseCurrentlyLoading = true; databaseCurrentlyLoading = true;
initDatabase(context); initDatabase(context);
signaturesCount = 0;
File publicKey = new File(databasePath + "/gpg.key"); File publicKey = new File(databasePath + "/gpg.key");
GPGDetachedSignatureVerifier verifier = new GPGDetachedSignatureVerifier(Utils.getSigningKey(context)); GPGDetachedSignatureVerifier verifier = new GPGDetachedSignatureVerifier(Utils.getSigningKey(context));
for (SignatureDatabase database : signatureDatabases) { for (SignatureDatabase database : signatureDatabases) {

View file

@ -0,0 +1 @@
* Fixup signature count miscalculation when database already loaded