From 7d774092c63d4b376ed7c9d22016ea7ece582387 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 6 Dec 2022 12:43:43 -0500 Subject: [PATCH] Add support for the Amnesty International Investgations database Signed-off-by: Tad --- README.md | 1 + app/build.gradle | 2 +- app/src/main/java/us/spotco/malwarescanner/Database.java | 3 +++ .../main/java/us/spotco/malwarescanner/MainActivity.java | 7 +++++-- app/src/main/res/values/arrays.xml | 1 + fastlane/metadata/android/en-US/changelogs/90.txt | 1 + 6 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/90.txt diff --git a/README.md b/README.md index ee96e86..991d9e5 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ Credits - ClamAV for the databases (GPLv2) - ESET for extra databases (BSD 2-Clause) - Nex (@botherder) for extra databases (CC BY-SA 4.0) +- Amnesty International for extra databases (CC BY 2.0) - RecursiveFileObserver.java (GPLv3): Daniel Gultsch, ownCloud Inc., Bartek Przybylski - Petra Mirelli for the German/Spanish/Italian translations, the app banner/feature graphic, and various tweaks. - Jean-Luc Tibaux and Petra Mirelli for the French translations. diff --git a/app/build.gradle b/app/build.gradle index 9c80e7e..c36e8d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { applicationId "us.spotco.malwarescanner" minSdkVersion 16 targetSdkVersion 32 - versionCode 89 + versionCode 90 versionName "2.27" resConfigs 'en', 'af', 'de', 'es', 'fi', 'fr', 'it', 'pl', 'pt', 'ru' } diff --git a/app/src/main/java/us/spotco/malwarescanner/Database.java b/app/src/main/java/us/spotco/malwarescanner/Database.java index be88214..c20017a 100644 --- a/app/src/main/java/us/spotco/malwarescanner/Database.java +++ b/app/src/main/java/us/spotco/malwarescanner/Database.java @@ -93,6 +93,9 @@ class Database { signatureDatabases.add(new SignatureDatabase(baseURL, "targetedthreats.hdb.gz")); signatureDatabases.add(new SignatureDatabase(baseURL, "targetedthreats.hsb.gz")); } + if (prefs.getBoolean("SIGNATURES_AMNESTY", true)) { + signatureDatabases.add(new SignatureDatabase(baseURL, "amnesty.hsb.gz")); + } if (prefs.getBoolean("SIGNATURES_ESET", true)) { signatureDatabases.add(new SignatureDatabase(baseURL, "eset.hdb.gz")); signatureDatabases.add(new SignatureDatabase(baseURL, "eset.hsb.gz")); diff --git a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java index 6d1efcf..7fb0c9c 100644 --- a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java +++ b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java @@ -160,13 +160,15 @@ public class MainActivity extends AppCompatActivity { localizeDBDescription("ClamAV: Main\n • SIZE: SIZE_LARGE\n • LICENSE: GPL-2.0\n • AUTHOR: Cisco\n • SOURCE: https://clamav.net\n"), localizeDBDescription("ClamAV: Daily\n • SIZE: SIZE_LARGE\n • LICENSE: GPL-2.0\n • AUTHOR: Cisco\n • SOURCE: https://clamav.net\n"), localizeDBDescription("ESET\n • SIZE: SIZE_SMALL\n • LICENSE: BSD 2-Clause\n • AUTHOR: ESET\n • SOURCE: https://github.com/eset/malware-ioc\n"), - localizeDBDescription("Targeted Threats\n • SIZE: SIZE_SMALL\n • LICENSE: CC BY-SA 4.0\n • AUTHOR: Nex\n • SOURCE: https://github.com/botherder/targetedthreats")}; + localizeDBDescription("Targeted Threats\n • SIZE: SIZE_SMALL\n • LICENSE: CC BY-SA 4.0\n • AUTHOR: Nex\n • SOURCE: https://github.com/botherder/targetedthreats\n"), + localizeDBDescription("Amnesty Tech Investigations\n • SIZE: SIZE_SMALL\n • LICENSE: CC BY 2.0\n • AUTHOR: Amnesty International\n • SOURCE: https://github.com/amnestytech/investigations")}; final boolean[] databaseDefaults = { prefs.getBoolean("SIGNATURES_CLAMAV-ANDROID", true), prefs.getBoolean("SIGNATURES_CLAMAV-MAIN", false), prefs.getBoolean("SIGNATURES_CLAMAV-DAILY", false), prefs.getBoolean("SIGNATURES_ESET", true), - prefs.getBoolean("SIGNATURES_TARGETEDTHREATS", true)}; + prefs.getBoolean("SIGNATURES_TARGETEDTHREATS", true), + prefs.getBoolean("SIGNATURES_AMNESTY", true)}; Dialog databaseDialog; AlertDialog.Builder databaseBuilder = new AlertDialog.Builder(this); @@ -179,6 +181,7 @@ public class MainActivity extends AppCompatActivity { prefs.edit().putBoolean("SIGNATURES_CLAMAV-DAILY", databaseDefaults[2]).apply(); prefs.edit().putBoolean("SIGNATURES_ESET", databaseDefaults[3]).apply(); prefs.edit().putBoolean("SIGNATURES_TARGETEDTHREATS", databaseDefaults[4]).apply(); + prefs.edit().putBoolean("SIGNATURES_AMNESTY", databaseDefaults[5]).apply(); }); databaseDialog = databaseBuilder.create(); diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 511ba77..3989eb0 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -14,6 +14,7 @@ • ClamAV by Cisco: Signature Databases • ESET: Signature Databases • Nex (@botherder): Signature Databases + • Amnesty International: Signature Databases • RecursiveFileObserver.java: Daniel Gultsch, ownCloud Inc., Bartek Przybylski • Google: App Icon diff --git a/fastlane/metadata/android/en-US/changelogs/90.txt b/fastlane/metadata/android/en-US/changelogs/90.txt new file mode 100644 index 0000000..39c365c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/90.txt @@ -0,0 +1 @@ +* Add support for the Amnesty International Investgations database