Add the Cloudflare mirror and bump version

Signed-off-by: Tavi <tavi@divested.dev>

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "us.spotco.malwarescanner"
         minSdkVersion 16
         targetSdkVersion 32
-        versionCode 309
+        versionCode 310
-        versionName "3.09"
+        versionName "3.10"
         resConfigs 'en', 'af', 'cs', 'de', 'el', 'es', 'fi', 'fr', 'gl', 'it', 'pl', 'pt', 'pt-rBR', 'ru', 'tr', 'zh-rCN'
     }
     buildTypes {

app/src/main/java/us/spotco/malwarescanner/MainActivity.java

@@ -196,10 +196,14 @@ public class MainActivity extends Activity {
                         }
                         prefs.edit().putString("DATABASE_SERVER", newServer).apply();
                     });
-                    builderServerOverride.setNegativeButton(getString(R.string.lblReset), (dialog, which) -> {
+                    builderServerOverride.setNegativeButton(getString(R.string.lblResetPrimary), (dialog, which) -> {
                         prefs.edit().putString("DATABASE_SERVER", Utils.DATABASE_URL_DEFAULT).apply();
                         dialog.cancel();
                     });
+                    builderServerOverride.setNeutralButton(getString(R.string.lblResetCloudflare), (dialog, which) -> {
+                        prefs.edit().putString("DATABASE_SERVER", Utils.DATABASE_URL_CLOUDFLARE).apply();
+                        dialog.cancel();
+                    });
                     builderServerOverride.show();
                 }
                 break;

app/src/main/java/us/spotco/malwarescanner/Utils.java

@@ -45,6 +45,7 @@ class Utils {
     public final static int MAX_SCAN_SIZE = (1000 * 1000) * 500; //500MB
     public final static int MAX_SCAN_SIZE_REALTIME = (1000 * 1000) * 250; //250MB
     public final static String DATABASE_URL_DEFAULT = "https://divested.dev/MalwareScannerSignatures/";
+    public final static String DATABASE_URL_CLOUDFLARE = "https://eeyo.re/MalwareScannerSignatures/";
     public final static String SIGNING_KEY_DEFAULT = "BADFCABDDBF5B694";
 
     public static final AtomicInteger FILES_SCANNED = new AtomicInteger();

app/src/main/res/values/strings.xml

@@ -76,4 +76,6 @@
     <string name="confirm_update_summary">You appear to be on a metered connection. Are you sure you want to update the databases?\nIt may download up to %s megabytes of data.</string>
     <string name="lblUpdateRunning">Skipping action, an update is running!</string>
     <string name="lblWroteTestFiles">Wrote test files!</string>
+    <string name="lblResetPrimary">Primary Servers</string>
+    <string name="lblResetCloudflare">Cloudflare Mirror</string>
 </resources>

fastlane/metadata/android/en-US/changelogs/308.txt

@@ -1,4 +1,4 @@
 * Added Galician translations from @ghose
-* Added Brazilian Portuguese from @lucasmz
+* Added Brazilian Portuguese translations from @lucasmz
 * Updated German translations from @thereisnoanderson
 * Updated Italian translations from Tommaso Fonda

fastlane/metadata/android/en-US/changelogs/310.txt

@@ -0,0 +1,6 @@
+* The database override option now has a choice for primary servers or a Cloudflare mirror
+* Updated/merged Brazilian translations from @lucasmz
+* Updated Russian fastlane translations from @t1011
+* Updated Russian fastlane translations from @yurtpage
+* Fastlane feature graphic banners are now translated thanks to @eloitor and @lucasmz
+* Repo READMEs have received translated F-Droid badges from @eloitor