From de868c458fe6f875e6c6ebcfe5817bf2ff94893f Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 21 Jul 2021 15:31:13 -0400
Subject: [PATCH] Bump versions

+ fix small quirk when too few sigs
---
 .idea/jarRepositories.xml                                 | 5 +++++
 README.md                                                 | 1 +
 app/build.gradle                                          | 8 ++++----
 app/src/main/java/us/spotco/malwarescanner/Database.java  | 2 +-
 .../main/java/us/spotco/malwarescanner/MainActivity.java  | 2 +-
 build.gradle                                              | 6 +++---
 gradle/wrapper/gradle-wrapper.properties                  | 4 ++--
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..e34606c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 8d10806..5996a35 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ Credits
 -------
 - ClamAV for the databases (GPLv2)
 - ESET for extra databases (BSD 2-Clause)
+- Nex (@botherder) for extra databases (CC BY-SA 4.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 6f9c0a8..38c86c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "us.spotco.malwarescanner"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 73
-        versionName "2.20"
+        versionCode 74
+        versionName "2.21"
         resConfigs "en", "de", "es", "fr", "it", "pt", "ru"
     }
     buildTypes {
@@ -29,6 +29,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
 }
diff --git a/app/src/main/java/us/spotco/malwarescanner/Database.java b/app/src/main/java/us/spotco/malwarescanner/Database.java
index ac27540..8bb7a84 100644
--- a/app/src/main/java/us/spotco/malwarescanner/Database.java
+++ b/app/src/main/java/us/spotco/malwarescanner/Database.java
@@ -69,7 +69,7 @@ class Database {
     }
 
     public static boolean isDatabaseLoaded() {
-        return areDatabasesAvailable() && databaseFullyLoaded && signaturesMD5.size() > 0 && signaturesSHA1.size() > 0 && signaturesSHA256.size() > 0;
+        return areDatabasesAvailable() && databaseFullyLoaded && (signaturesMD5.size() > 0 || signaturesSHA1.size() > 0 || signaturesSHA256.size() > 0);
     }
 
     public static int getSignatureCount() {
diff --git a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
index 4d763d1..754fc51 100644
--- a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
+++ b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
@@ -174,7 +174,7 @@ 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-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")};
         final boolean[] databaseDefaults = {
                 prefs.getBoolean("SIGNATURES_CLAMAV-ANDROID", true),
                 prefs.getBoolean("SIGNATURES_CLAMAV-MAIN", false),
diff --git a/build.gradle b/build.gradle
index 78f7a34..ecd755e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,10 +4,10 @@ buildscript {
     
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,7 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3eb1008..8174453 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists