MaintainTeam/Hypatia
1
0
Fork 0
mirror of https://github.com/MaintainTeam/Hypatia.git synced 2025-03-01 05:48:23 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'iNtEgraIR2021-stable-patch-25864' into 'stable'

Browse source 
Adding 'versionName' from 'app/build.gradle' to UI

See merge request divested-mobile/hypatia!4
This commit is contained in:
Tad 2021-03-03 20:32:31 +00:00
commit 243751edc4
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/us/spotco/malwarescanner/MainActivity.java
View file

@ -50,6 +50,8 @@ import java.io.File;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import us.spotco.malwarescanner.BuildConfig;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
private SharedPreferences prefs = null; private SharedPreferences prefs = null;
@ -57,6 +59,8 @@ public class MainActivity extends AppCompatActivity {
private TextView logView; private TextView logView;
private static final String buildVersionName = BuildConfig.VERSION_NAME;
private boolean scanSystem = false; private boolean scanSystem = false;
private boolean scanApps = true; private boolean scanApps = true;
private boolean scanInternal = true; private boolean scanInternal = true;
@ -78,8 +82,13 @@ public class MainActivity extends AppCompatActivity {
logView = findViewById(R.id.txtLogOutput); logView = findViewById(R.id.txtLogOutput);
logView.setMovementMethod(new ScrollingMovementMethod()); logView.setMovementMethod(new ScrollingMovementMethod());
logView.setTextIsSelectable(true); logView.setTextIsSelectable(true);
logView.append(getString(R.string.app_copyright) + "\n"); logView.append(getString(R.string.app_copyright) + "\n");
logView.append(getString(R.string.app_license) + "\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"); logView.append(getString(R.string.app_db_type_clamav) + "\n\n");
malwareScanner = new MalwareScanner(this, this, true); malwareScanner = new MalwareScanner(this, this, true);

3
app/src/main/res/values-de/strings.xml
View file

@ -3,7 +3,8 @@
<string name="app_name">Hypatia</string> <string name="app_name">Hypatia</string>
<string name="app_copyright">Copyright 2017-2021 Divested Computing Group</string> <string name="app_copyright">Copyright 2017-2021 Divested Computing Group</string>
<string name="app_license">Lizenz: GPL-3.0</string> <string name="app_license">Lizenz: GPL-3.0</string>
<string name="app_db_type_clamav">Basierend auf ClamAV-Signaturen</string> <string name="app_version">Versionsnummer: %s</string>
<string name="app_db_type_clamav">Basierend auf Signaturen im Stil von ClamAV</string>
<string name="lblOnionRoutingToggle">Download über Tor</string> <string name="lblOnionRoutingToggle">Download über Tor</string>
<string name="lblOnionRoutingEnabledHint">Download über Tor wurde ausgewählt, das kann etwas länger dauern. Bitte haben sie Geduld...</string> <string name="lblOnionRoutingEnabledHint">Download über Tor wurde ausgewählt, das kann etwas länger dauern. Bitte haben sie Geduld...</string>

3
app/src/main/res/values-fr/strings.xml
View file

@ -3,7 +3,8 @@
<string name="app_name">Hypatia</string> <string name="app_name">Hypatia</string>
<string name="app_copyright">Copyright 2017-2021 Divested Computing Group</string> <string name="app_copyright">Copyright 2017-2021 Divested Computing Group</string>
<string name="app_license">Licence: GPL-3.0</string> <string name="app_license">Licence: GPL-3.0</string>
<string name="app_db_type_clamav">Propulsé par les signatures de ClamAV</string> <string name="app_version">Numéro de version: %s</string>
<string name="app_db_type_clamav">Propulsé par les signatures de style ClamAV</string>
<string name="lblOnionRoutingToggle">Téléchargement par Tor</string> <string name="lblOnionRoutingToggle">Téléchargement par Tor</string>
<string name="lblOnionRoutingEnabledHint">Téléchargement par Tor, cela peut prendre un certain temps...</string> <string name="lblOnionRoutingEnabledHint">Téléchargement par Tor, cela peut prendre un certain temps...</string>

1
app/src/main/res/values/strings.xml
View file

@ -2,6 +2,7 @@
<string name="app_name">Hypatia</string> <string name="app_name">Hypatia</string>
<string name="app_copyright">Copyright 2017-2021 Divested Computing Group</string> <string name="app_copyright">Copyright 2017-2021 Divested Computing Group</string>
<string name="app_license">License: GPL-3.0</string> <string name="app_license">License: GPL-3.0</string>
<string name="app_version">Version: %s</string>
<string name="app_db_type_clamav">Powered by ClamAV style signatures</string> <string name="app_db_type_clamav">Powered by ClamAV style signatures</string>
<string name="lblOnionRoutingToggle">Download over Tor</string> <string name="lblOnionRoutingToggle">Download over Tor</string>