Skip to content

Commit e31eafe

Browse files
InhishonorInhishonor
committed
Change names for types of scanning.
In order to improve UX by stating exactly what is being scanned, when scanning external and removable storage.
1 parent 0063488 commit e31eafe

File tree

30 files changed

+70
-72
lines changed

30 files changed

+70
-72
lines changed

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

+11-13
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static android.os.Build.VERSION.SDK_INT;
2222

2323
import android.Manifest;
24-
import android.app.Activity;
2524
import android.app.AlertDialog;
2625
import android.app.Dialog;
2726
import android.content.Context;
@@ -36,7 +35,6 @@
3635
import android.os.PowerManager;
3736
import android.provider.Settings;
3837
import android.text.InputType;
39-
import android.util.Log;
4038
import android.text.method.ScrollingMovementMethod;
4139
import android.view.Menu;
4240
import android.view.MenuItem;
@@ -63,8 +61,8 @@ public class MainActivity extends AppCompatActivity {
6361

6462
private boolean scanSystem = false;
6563
private boolean scanApps = true;
66-
private boolean scanInternal = true;
67-
private boolean scanExternal = false;
64+
private boolean scanExternal = true;
65+
private boolean scanRemovable = false;
6866

6967
private TextView logView;
7068

@@ -362,14 +360,14 @@ public final boolean onOptionsItemSelected(MenuItem item) {
362360
scanApps = !item.isChecked();
363361
item.setChecked(scanApps);
364362
break;
365-
case R.id.mnuScanInternal:
366-
scanInternal = !item.isChecked();
367-
item.setChecked(scanInternal);
368-
break;
369363
case R.id.mnuScanExternal:
370364
scanExternal = !item.isChecked();
371365
item.setChecked(scanExternal);
372366
break;
367+
case R.id.mnuScanRemovable:
368+
scanRemovable = !item.isChecked();
369+
item.setChecked(scanRemovable);
370+
break;
373371
case R.id.mnuSelfTestReal:
374372
Utils.writeSelfTestFiles(this);
375373
break;
@@ -435,15 +433,15 @@ private void startScanner() {
435433
}
436434
}
437435
}
438-
if (scanInternal) {
436+
if (scanExternal) {
439437
if (Environment.getExternalStorageDirectory() != null) {
440438
filesToScan.add(Environment.getExternalStorageDirectory());
441439
}
442440
}
443-
if (scanExternal) {
444-
File externalStorage = new File("/storage");
445-
if (externalStorage.exists()) {
446-
filesToScan.add(externalStorage);
441+
if (scanRemovable) {
442+
File removableStorage = new File("/storage");
443+
if (removableStorage.exists()) {
444+
filesToScan.add(removableStorage);
447445
}
448446
}
449447

‎app/src/main/res/menu/menu_main.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
android:checkable="true"
4545
android:checked="true" />
4646
<item
47-
android:id="@+id/mnuScanInternal"
48-
android:title="@string/lblScanInternal"
47+
android:id="@+id/mnuScanExternal"
48+
android:title="@string/lblScanExternal"
4949
android:checkable="true"
5050
android:checked="true" />
5151
<item
52-
android:id="@+id/mnuScanExternal"
53-
android:title="@string/lblScanExternal"
52+
android:id="@+id/mnuScanRemovable"
53+
android:title="@string/lblScanRemovable"
5454
android:checkable="true"
5555
android:checked="false" />
5656
<item

‎app/src/main/res/values-af/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<string name="lblFullCredits">Erkennings</string>
1212
<string name="lblScanSystem">Skandeer sisteem</string>
1313
<string name="lblScanApps">Skandeer APKs</string>
14-
<string name="lblScanInternal">Skandeer Interne Stoorruimte</string>
15-
<string name="lblScanExternal">Skandeer Eksterne Stoorruimte</string>
14+
<string name="lblScanExternal">Skandeer Interne Stoorruimte</string>
15+
<string name="lblScanRemovable">Skandeer Eksterne Stoorruimte</string>
1616
<string name="lblNotificationMalwareDetectionTitle">Wanware Opgetel</string>
1717
<string name="lblNotificationMalwareDetectionDescription">Gebruik om te waarsku wanneer wanware opgetel word</string>
1818
<string name="lblNotificationRealtimeTitle">Intydse Skandering</string>

‎app/src/main/res/values-ar/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
<string name="lblDatabaseServer">تجاوز خادم قاعدة البيانات</string>
1010
<string name="lblScanSystem">فحص/النظام</string>
1111
<string name="lblScanApps">افحص ملفات APK للتطبيقات</string>
12-
<string name="lblScanInternal">افحص التخزين الداخلي</string>
12+
<string name="lblScanExternal">افحص التخزين الداخلي</string>
1313
<string name="lblNotificationMalwareDetectionDescription">يُستخدم للتنبيه عند اكتشاف البرامج الخبيثة</string>
1414
<string name="lblNotificationRealtimeDescription">يُستخدم لإظهار عداد الملفات المفحوصة والحفاظ على الخدمة الخلفية</string>
1515
<string name="lblNotificationRealtimeText">سيتم اكتشاف البرامج الخبيثة المعروفة في الوقت الفعلي</string>
1616
<string name="lblNotificationRealtimeStopped">Hypatia: توقف الفحص في الوقت الفعلي</string>
1717
<string name="main_no_database_available">لا توجد قاعدة بيانات متاحة، لا يتم الفحص…</string>
1818
<string name="app_copyright">حقوق الطبع والنشر 2017-2024 لDivested Computing Group</string>
1919
<string name="app_db_type_clamav">مدعوم بتوقيعات نمط ClamAV</string>
20-
<string name="lblScanExternal">افحص التخزين الخارجي</string>
20+
<string name="lblScanRemovable">افحص التخزين الخارجي</string>
2121
<string name="lblNotificationMalwareDetectionTitle">اكتشاف البرامج الخبيثة</string>
2222
<string name="lblNotificationRealtimeTitle">فاحص في الوقت الفعلي</string>
2323
<string name="lblRealtimeScannerToggle">فاحص في الوقت الفعلي</string>

‎app/src/main/res/values-bg/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources>
33
<string name="app_copyright">Copyright 2017-2024 Divested Computing Group</string>
44
<string name="lblFullCredits">Кредити</string>
5-
<string name="lblScanExternal">Сканиране на външна памет</string>
5+
<string name="lblScanRemovable">Сканиране на външна памет</string>
66
<string name="lblNotificationMalwareDetectionTitle">Откриване на зловреден софтуер</string>
77
<string name="lblNotificationRealtimeDetection">Открит зловреден софтуер:</string>
88
<string name="main_database_override">Използва се сървър %s</string>
@@ -32,7 +32,7 @@
3232
<string name="lblOnionRoutingNotInstalled">Orbot не е инсталиран!</string>
3333
<string name="lblUpdateDatabase">Актуализирайте бази данни</string>
3434
<string name="lblScanApps">Сканиране на APK файлове на приложения</string>
35-
<string name="lblScanInternal">Сканиране на вътрешната памет</string>
35+
<string name="lblScanExternal">Сканиране на вътрешната памет</string>
3636
<string name="lblNotificationMalwareDetectionDescription">Използва се за предупреждение при откриване на зловреден софтуер</string>
3737
<string name="lblNotificationRealtimeTitle">Скенер в реално време</string>
3838
<string name="lblScanSystem">Сканиране / система</string>

‎app/src/main/res/values-cs/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<string name="lblFullCredits">Poděkování</string>
1313
<string name="lblScanSystem">Skenovat /system</string>
1414
<string name="lblScanApps">Skenovat APK aplikací</string>
15-
<string name="lblScanInternal">Skenovat interní úložiště</string>
16-
<string name="lblScanExternal">Skenovat externí úložiště</string>
15+
<string name="lblScanExternal">Skenovat interní úložiště</string>
16+
<string name="lblScanRemovable">Skenovat externí úložiště</string>
1717
<string name="lblNotificationMalwareDetectionTitle">Detekce malware</string>
1818
<string name="lblNotificationMalwareDetectionDescription">Používáno při detekci malware</string>
1919
<string name="lblNotificationRealtimeTitle">Sken v reálném čase</string>

‎app/src/main/res/values-de/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<string name="lblFullCredits">Danksagung</string>
1313
<string name="lblScanSystem">/system scannen</string>
1414
<string name="lblScanApps">APK-Dateien scannen</string>
15-
<string name="lblScanInternal">Internen Speicher scannen</string>
16-
<string name="lblScanExternal">Externen Speicher scannen</string>
15+
<string name="lblScanExternal">Internen Speicher scannen</string>
16+
<string name="lblScanRemovable">Externen Speicher scannen</string>
1717
<string name="lblNotificationMalwareDetectionTitle">Schadsoftware-Erkennung</string>
1818
<string name="lblNotificationMalwareDetectionDescription">Dient zur direkten Warnung bei erkannter Schadsoftware</string>
1919
<string name="lblNotificationRealtimeTitle">Echtzeit-Scanner</string>

‎app/src/main/res/values-el/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<string name="lblFullCredits">Credits</string>
1313
<string name="lblScanSystem">Σάρωση /system</string>
1414
<string name="lblScanApps">Σάρωση των APKs των εφαρμογών</string>
15-
<string name="lblScanInternal">Σάρωση εσωτερικού χώρου αποθήκευσης</string>
16-
<string name="lblScanExternal">Σάρωση εξωτερικού χώρου αποθήκευσης</string>
15+
<string name="lblScanExternal">Σάρωση εσωτερικού χώρου αποθήκευσης</string>
16+
<string name="lblScanRemovable">Σάρωση εξωτερικού χώρου αποθήκευσης</string>
1717
<string name="lblNotificationMalwareDetectionTitle">Ανίχνευση κακόβουλου λογισμικού</string>
1818
<string name="lblNotificationMalwareDetectionDescription">Ειδοποίησέ με όταν ανιχνεύεται κακόβουλο λογισμικό</string>
1919
<string name="lblNotificationRealtimeTitle">Σάρωση σε πραγματικό χρόνο</string>

‎app/src/main/res/values-es/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<string name="lblFullCredits">Créditos</string>
1212
<string name="lblScanSystem">Escanear /system</string>
1313
<string name="lblScanApps">Escanear las APKs de las aplicaciones</string>
14-
<string name="lblScanInternal">Escanear el almacenamiento interno</string>
15-
<string name="lblScanExternal">Escanear el almacenamiento externo</string>
14+
<string name="lblScanExternal">Escanear el almacenamiento interno</string>
15+
<string name="lblScanRemovable">Escanear el almacenamiento externo</string>
1616
<string name="lblNotificationMalwareDetectionTitle">Detección de software malicioso</string>
1717
<string name="lblNotificationMalwareDetectionDescription">Sirve para alertar cuando se detecta software malicioso</string>
1818
<string name="lblNotificationRealtimeTitle">Escáner en tiempo real</string>

‎app/src/main/res/values-et/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<string name="lblDatabaseServer">Kasuta muud andmekogu</string>
1616
<string name="lblScanSystem">Kontrolli /system kausta</string>
1717
<string name="lblScanApps">Kontrolli rakenduste apk-faile</string>
18-
<string name="lblScanInternal">Kontrolli sisemist andmekogu</string>
19-
<string name="lblScanExternal">Kontrolli välist andmekogu</string>
18+
<string name="lblScanExternal">Kontrolli sisemist andmekogu</string>
19+
<string name="lblScanRemovable">Kontrolli välist andmekogu</string>
2020
<string name="lblNotificationMalwareDetectionTitle">Tuvasta pahavara</string>
2121
<string name="lblNotificationMalwareDetectionDescription">Kasutusel hoiatamaks pahavara tuvastamisel</string>
2222
<string name="lblNotificationRealtimeTitle">Kontrolli reaalajas</string>

‎app/src/main/res/values-fi/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<string name="lblFullCredits">Krediitit</string>
1111
<string name="lblScanSystem">Tarkista /järjestelmä</string>
1212
<string name="lblScanApps">Tarkista sovellus APK:t</string>
13-
<string name="lblScanInternal">Tarkista sisäinen tallennustila</string>
14-
<string name="lblScanExternal">Tarkista ulkoinen tallennustila</string>
13+
<string name="lblScanExternal">Tarkista sisäinen tallennustila</string>
14+
<string name="lblScanRemovable">Tarkista ulkoinen tallennustila</string>
1515
<string name="lblNotificationMalwareDetectionTitle">Haittaohjelmien tunnistus</string>
1616
<string name="lblNotificationMalwareDetectionDescription">Käytetään hälyttämään, kun haittaohjelma havaitaan</string>
1717
<string name="lblNotificationRealtimeTitle">Reaaliaikainen tarkistus</string>

‎app/src/main/res/values-fr/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<string name="lblFullCredits">Crédits</string>
1313
<string name="lblScanSystem">Analyser le /système</string>
1414
<string name="lblScanApps">Analyser les APK des applis</string>
15-
<string name="lblScanInternal">Analyser la mémoire interne</string>
16-
<string name="lblScanExternal">Analyser la mémoire externe</string>
15+
<string name="lblScanExternal">Analyser la mémoire interne</string>
16+
<string name="lblScanRemovable">Analyser la mémoire externe</string>
1717
<string name="lblNotificationMalwareDetectionTitle">Détection des logiciels malveillants</string>
1818
<string name="lblNotificationMalwareDetectionDescription">Utilisé pour alerter lorsqu\'un logiciel malveillant est détecté</string>
1919
<string name="lblNotificationRealtimeTitle">Analyser en temps réel</string>

‎app/src/main/res/values-gl/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<string name="lblDatabaseServer">Sobreescribir servidor BDD</string>
99
<string name="lblFullCredits">Crédito</string>
1010
<string name="lblScanApps">Examinar APKs de App</string>
11-
<string name="lblScanExternal">Examinar Almacenaxe Externa</string>
11+
<string name="lblScanRemovable">Examinar Almacenaxe Externa</string>
1212
<string name="lblNotificationRealtimeStopped">Hypatia: Detívose o Exame en tempo real</string>
1313
<string name="lblReset">Restablecer</string>
1414
<string name="lblOverride">Sobreescribir</string>
@@ -34,7 +34,7 @@
3434
<string name="main_files_pending_scan">%s ficheiros pendentes do exame</string>
3535
<string name="main_database_loading">A cargar base de datos…</string>
3636
<string name="app_copyright">Copyright 2017-2024 Divested Computing Group</string>
37-
<string name="lblScanInternal">Examinar Almacenaxe Interna</string>
37+
<string name="lblScanExternal">Examinar Almacenaxe Interna</string>
3838
<string name="app_version">Versión: %s</string>
3939
<string name="lblScanSystem">Examinar /system</string>
4040
<string name="lblUpdateDatabase">Actualizar bases de datos</string>

‎app/src/main/res/values-hr/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<string name="lblUpdateDatabase">Ažurirajte baze podataka</string>
88
<string name="lblScanSystem">Skeniraj /sustav</string>
99
<string name="lblScanApps">Skenirajte APK-ove aplikacija</string>
10-
<string name="lblScanExternal">Skeniraj vanjsku pohranu</string>
10+
<string name="lblScanRemovable">Skeniraj vanjsku pohranu</string>
1111
<string name="lblNotificationMalwareDetectionTitle">Otkrivanje zlonamjernog softvera</string>
1212
<string name="lblNotificationRealtimeTitle">Skener u stvarnom vremenu</string>
1313
<string name="lblNotificationRealtimeDetection">Otkriven zlonamjerni softver:</string>
@@ -41,7 +41,7 @@
4141
<string name="confirm_link_scanner_title">Omogućiti skener veza?</string>
4242
<string name="app_license">Licenca: GPL-3.0</string>
4343
<string name="lblFullCredits">Zasluge</string>
44-
<string name="lblScanInternal">Skeniraj unutarnju pohranu</string>
44+
<string name="lblScanExternal">Skeniraj unutarnju pohranu</string>
4545
<string name="lblNotificationMalwareDetectionDescription">Koristi se za upozorenje kada se otkrije zlonamjerni softver</string>
4646
<string name="lblNotificationRealtimeText">Poznati zlonamjerni softver bit će otkriven u stvarnom vremenu</string>
4747
<string name="lblNotificationRealtimeStopped">Hypatia: Zaustavljeno skeniranje u stvarnom vremenu</string>

‎app/src/main/res/values-in/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<string name="lblScanSystem">Pindai /sistem</string>
1414
<string name="lblScanApps">Pindai berkas APK aplikasi</string>
1515
<string name="lblOnionRoutingEnabledHint">Mengunduh dalam jaringan Tor. Proses ini akan memakan waktu…</string>
16-
<string name="lblScanExternal">Pindai Penyimpanan Eksternal</string>
17-
<string name="lblScanInternal">Pindai Penyimpanan Internal</string>
16+
<string name="lblScanRemovable">Pindai Penyimpanan Eksternal</string>
17+
<string name="lblScanExternal">Pindai Penyimpanan Internal</string>
1818
<string name="lblNotificationMalwareDetectionTitle">Deteksi Perangkat Perusak (Malware)</string>
1919
<string name="lblNotificationRealtimeDescription">Digunakan untuk menampilkan jumlah berkas yang dipindai dan mempertahankan agar aplikasi berjalan di latar</string>
2020
<string name="lblNotificationRealtimeText">Notifikasi perangkat perusak yang terdeteksi dalam waktu langsung</string>

‎app/src/main/res/values-it/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<string name="lblFullCredits">Riconoscimenti</string>
1212
<string name="lblScanSystem">Scansiona le app di sistema</string>
1313
<string name="lblScanApps">Scansiona le app</string>
14-
<string name="lblScanInternal">Scansiona la memoria interna</string>
15-
<string name="lblScanExternal">Scansiona la memoria esterna</string>
14+
<string name="lblScanExternal">Scansiona la memoria interna</string>
15+
<string name="lblScanRemovable">Scansiona la memoria esterna</string>
1616
<string name="lblNotificationMalwareDetectionTitle">Malware rilevato</string>
1717
<string name="lblNotificationMalwareDetectionDescription">Indica quando il malware è rilevato</string>
1818
<string name="lblNotificationRealtimeTitle">Scansione in tempo reale</string>

‎app/src/main/res/values-iw/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
<string name="lblFullCredits">קרדיטים</string>
5555
<string name="main_database_not_changed">קובץ לא השתנה</string>
5656
<string name="lblNotificationRealtimeStopped">Hypatia: הסריקה בזמן אמת הופסקה</string>
57-
<string name="lblScanExternal">סרוק אחסון חיצוני</string>
57+
<string name="lblScanRemovable">סרוק אחסון חיצוני</string>
5858
<string name="lblScanApps">סריקת אפליקציות APKs</string>
5959
<string name="lblDatabaseServer">עקיפה של שרת מסד הנתונים</string>
60-
<string name="lblScanInternal">סרוק אחסון פנימי</string>
60+
<string name="lblScanExternal">סרוק אחסון פנימי</string>
6161
<string name="lblOverride">עקיפה</string>
6262
<string name="lblSigningKey">מפתח חתימת מסד נתונים</string>
6363
<string name="lblScanSystem">סריקה /system</string>

‎app/src/main/res/values-ja/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<string name="lblScanSystem">/systemをスキャン</string>
3434
<string name="app_license">License: GPL-3.0</string>
3535
<string name="lblScanApps">アプリAPKをスキャン</string>
36-
<string name="lblScanInternal">内部ストレージをスキャン</string>
37-
<string name="lblScanExternal">外部ストレージをスキャン</string>
36+
<string name="lblScanExternal">内部ストレージをスキャン</string>
37+
<string name="lblScanRemovable">外部ストレージをスキャン</string>
3838
<string name="lblNotificationMalwareDetectionTitle">マルウェアを検出</string>
3939
<string name="lblNotificationRealtimeDescription">バックグラウンドサービスを維持するためと、スキャンされたファイルを表示するために利用</string>
4040
<string name="lblNotificationRealtimeStopped">Hypatia: リアルタイム検出が停止されました</string>

‎app/src/main/res/values-pl/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<string name="lblFullCredits">Uznania</string>
1313
<string name="lblScanSystem">Skanuj /system</string>
1414
<string name="lblScanApps">Skanuj pliki APK aplikacji</string>
15-
<string name="lblScanInternal">Skanuj pamięć wewnętrzną</string>
16-
<string name="lblScanExternal">Skanuj pamięć zewnętrzną</string>
15+
<string name="lblScanExternal">Skanuj pamięć wewnętrzną</string>
16+
<string name="lblScanRemovable">Skanuj pamięć zewnętrzną</string>
1717
<string name="lblNotificationMalwareDetectionTitle">Wykrywanie złośliwego oprogramowania</string>
1818
<string name="lblNotificationMalwareDetectionDescription">Wykorzystywane do informowania, gdy wykryto złośliwe oprogramowanie</string>
1919
<string name="lblNotificationRealtimeTitle">Skaner w czasie rzeczywistym</string>

0 commit comments

Comments
 (0)