From 21a62fd804517b616c4c7452e403ac34de3f9584 Mon Sep 17 00:00:00 2001 From: Petra Mirelli <8105680-iNtEgraIR2021@users.noreply.gitlab.com> Date: Wed, 3 Mar 2021 20:09:49 +0000 Subject: [PATCH] Adding 'versionName' from 'app/gradle.build' to UI --- .../main/java/us/spotco/malwarescanner/MainActivity.java | 9 +++++++++ app/src/main/res/values-de/strings.xml | 3 ++- app/src/main/res/values-fr/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java index 0ce5e0b..a20088b 100644 --- a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java +++ b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java @@ -50,6 +50,8 @@ import java.io.File; import java.util.HashSet; import java.util.Set; +import us.spotco.malwarescanner.BuildConfig; + public class MainActivity extends AppCompatActivity { private SharedPreferences prefs = null; @@ -57,6 +59,8 @@ public class MainActivity extends AppCompatActivity { private TextView logView; + private static final String buildVersionName = BuildConfig.VERSION_NAME; + private boolean scanSystem = false; private boolean scanApps = true; private boolean scanInternal = true; @@ -78,8 +82,13 @@ public class MainActivity extends AppCompatActivity { logView = findViewById(R.id.txtLogOutput); logView.setMovementMethod(new ScrollingMovementMethod()); logView.setTextIsSelectable(true); + logView.append(getString(R.string.app_copyright) + "\n"); logView.append(getString(R.string.app_license) + "\n"); + + //Credit (CC BY-SA 3.0): https://stackoverflow.com/a/21119027 + logView.append(getString(R.string.app_version, buildVersionName) + "\n"); + logView.append(getString(R.string.app_db_type_clamav) + "\n\n"); malwareScanner = new MalwareScanner(this, this, true); diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cb53709..97fbaad 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3,7 +3,8 @@ Hypatia Copyright 2017-2021 Divested Computing Group Lizenz: GPL-3.0 - Basierend auf ClamAV-Signaturen + Versionsnummer: %s + Basierend auf Signaturen im Stil von ClamAV Download über Tor Download über Tor wurde ausgewählt, das kann etwas länger dauern. Bitte haben sie Geduld... diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e6ceb0d..738eec6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3,7 +3,8 @@ Hypatia Copyright 2017-2021 Divested Computing Group Licence: GPL-3.0 - Propulsé par les signatures de ClamAV + Numéro de version: %s + Propulsé par les signatures de style ClamAV Téléchargement par Tor Téléchargement par Tor, cela peut prendre un certain temps... diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23d8ab8..7927b28 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,7 @@ Hypatia Copyright 2017-2021 Divested Computing Group License: GPL-3.0 + Version: %s Powered by ClamAV style signatures Download over Tor