Change names for types of scanning.

In order to improve UX by stating exactly what is being scanned, when scanning external and removable storage.

Author: Inhishonor

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

@@ -63,8 +63,8 @@ public class MainActivity extends AppCompatActivity {
 
     private boolean scanSystem = false;
     private boolean scanApps = true;
-    private boolean scanInternal = true;
-    private boolean scanExternal = false;
+    private boolean scanExternal = true;
+    private boolean scanRemovable = false;
 
     private TextView logView;
 
@@ -362,14 +362,14 @@ public final boolean onOptionsItemSelected(MenuItem item) {
                 scanApps = !item.isChecked();
                 item.setChecked(scanApps);
                 break;
-            case R.id.mnuScanInternal:
-                scanInternal = !item.isChecked();
-                item.setChecked(scanInternal);
-                break;
             case R.id.mnuScanExternal:
                 scanExternal = !item.isChecked();
                 item.setChecked(scanExternal);
                 break;
+            case R.id.mnuScanRemovable:
+                scanRemovable = !item.isChecked();
+                item.setChecked(scanRemovable);
+                break;
             case R.id.mnuSelfTestReal:
                 Utils.writeSelfTestFiles(this);
                 break;
@@ -435,15 +435,15 @@ private void startScanner() {
                 }
             }
         }
-        if (scanInternal) {
+        if (scanExternal) {
             if (Environment.getExternalStorageDirectory() != null) {
                 filesToScan.add(Environment.getExternalStorageDirectory());
             }
         }
-        if (scanExternal) {
-            File externalStorage = new File("/storage");
-            if (externalStorage.exists()) {
-                filesToScan.add(externalStorage);
+        if (scanRemovable) {
+            File removableStorage = new File("/storage");
+            if (removableStorage.exists()) {
+                filesToScan.add(removableStorage);
             }
         }
 

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

@@ -44,13 +44,13 @@
         android:checkable="true"
         android:checked="true" />
     <item
-        android:id="@+id/mnuScanInternal"
-        android:title="@string/lblScanInternal"
+        android:id="@+id/mnuScanExternal"
+        android:title="@string/lblScanExternal"
         android:checkable="true"
         android:checked="true" />
     <item
-        android:id="@+id/mnuScanExternal"
-        android:title="@string/lblScanExternal"
+        android:id="@+id/mnuScanRemovable"
+        android:title="@string/lblScanRemovable"
         android:checkable="true"
         android:checked="false" />
     <item

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

@@ -11,8 +11,8 @@
     <string name="lblFullCredits">Erkennings</string>
     <string name="lblScanSystem">Skandeer sisteem</string>
     <string name="lblScanApps">Skandeer APKs</string>
-    <string name="lblScanInternal">Skandeer Interne Stoorruimte</string>
     <string name="lblScanExternal">Skandeer Eksterne Stoorruimte</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Wanware Opgetel</string>
     <string name="lblNotificationMalwareDetectionDescription">Gebruik om te waarsku wanneer wanware opgetel word</string>
     <string name="lblNotificationRealtimeTitle">Intydse Skandering</string>

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

@@ -9,15 +9,15 @@
     <string name="lblDatabaseServer">تجاوز خادم قاعدة البيانات</string>
     <string name="lblScanSystem">فحص/النظام</string>
     <string name="lblScanApps">افحص ملفات APK للتطبيقات</string>
-    <string name="lblScanInternal">افحص التخزين الداخلي</string>
+    <string name="lblScanExternal">افحص التخزين الخارجي</string>
     <string name="lblNotificationMalwareDetectionDescription">يُستخدم للتنبيه عند اكتشاف البرامج الخبيثة</string>
     <string name="lblNotificationRealtimeDescription">يُستخدم لإظهار عداد الملفات المفحوصة والحفاظ على الخدمة الخلفية</string>
     <string name="lblNotificationRealtimeText">سيتم اكتشاف البرامج الخبيثة المعروفة في الوقت الفعلي</string>
     <string name="lblNotificationRealtimeStopped">Hypatia: توقف الفحص في الوقت الفعلي</string>
     <string name="main_no_database_available">لا توجد قاعدة بيانات متاحة، لا يتم الفحص…</string>
     <string name="app_copyright">حقوق الطبع والنشر 2017-2024 لDivested Computing Group</string>
     <string name="app_db_type_clamav">مدعوم بتوقيعات نمط ClamAV</string>
-    <string name="lblScanExternal">افحص التخزين الخارجي</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">اكتشاف البرامج الخبيثة</string>
     <string name="lblNotificationRealtimeTitle">فاحص في الوقت الفعلي</string>
     <string name="lblRealtimeScannerToggle">فاحص في الوقت الفعلي</string>

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

@@ -2,7 +2,7 @@
 <resources>
     <string name="app_copyright">Copyright 2017-2024 Divested Computing Group</string>
     <string name="lblFullCredits">Кредити</string>
-    <string name="lblScanExternal">Сканиране на външна памет</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Откриване на зловреден софтуер</string>
     <string name="lblNotificationRealtimeDetection">Открит зловреден софтуер:</string>
     <string name="main_database_override">Използва се сървър %s</string>
@@ -32,7 +32,7 @@
     <string name="lblOnionRoutingNotInstalled">Orbot не е инсталиран!</string>
     <string name="lblUpdateDatabase">Актуализирайте бази данни</string>
     <string name="lblScanApps">Сканиране на APK файлове на приложения</string>
-    <string name="lblScanInternal">Сканиране на вътрешната памет</string>
+    <string name="lblScanExternal">Сканиране на външна памет</string>
     <string name="lblNotificationMalwareDetectionDescription">Използва се за предупреждение при откриване на зловреден софтуер</string>
     <string name="lblNotificationRealtimeTitle">Скенер в реално време</string>
     <string name="lblScanSystem">Сканиране / система</string>

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

@@ -12,8 +12,8 @@
     <string name="lblFullCredits">Poděkování</string>
     <string name="lblScanSystem">Skenovat /system</string>
     <string name="lblScanApps">Skenovat APK aplikací</string>
-    <string name="lblScanInternal">Skenovat interní úložiště</string>
     <string name="lblScanExternal">Skenovat externí úložiště</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Detekce malware</string>
     <string name="lblNotificationMalwareDetectionDescription">Používáno při detekci malware</string>
     <string name="lblNotificationRealtimeTitle">Sken v reálném čase</string>

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

@@ -12,8 +12,8 @@
     <string name="lblFullCredits">Danksagung</string>
     <string name="lblScanSystem">/system scannen</string>
     <string name="lblScanApps">APK-Dateien scannen</string>
-    <string name="lblScanInternal">Internen Speicher scannen</string>
     <string name="lblScanExternal">Externen Speicher scannen</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Schadsoftware-Erkennung</string>
     <string name="lblNotificationMalwareDetectionDescription">Dient zur direkten Warnung bei erkannter Schadsoftware</string>
     <string name="lblNotificationRealtimeTitle">Echtzeit-Scanner</string>

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

@@ -12,8 +12,8 @@
     <string name="lblFullCredits">Credits</string>
     <string name="lblScanSystem">Σάρωση /system</string>
     <string name="lblScanApps">Σάρωση των APKs των εφαρμογών</string>
-    <string name="lblScanInternal">Σάρωση εσωτερικού χώρου αποθήκευσης</string>
     <string name="lblScanExternal">Σάρωση εξωτερικού χώρου αποθήκευσης</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Ανίχνευση κακόβουλου λογισμικού</string>
     <string name="lblNotificationMalwareDetectionDescription">Ειδοποίησέ με όταν ανιχνεύεται κακόβουλο λογισμικό</string>
     <string name="lblNotificationRealtimeTitle">Σάρωση σε πραγματικό χρόνο</string>

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

@@ -11,8 +11,8 @@
     <string name="lblFullCredits">Créditos</string>
     <string name="lblScanSystem">Escanear /system</string>
     <string name="lblScanApps">Escanear las APKs de las aplicaciones</string>
-    <string name="lblScanInternal">Escanear el almacenamiento interno</string>
     <string name="lblScanExternal">Escanear el almacenamiento externo</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Detección de software malicioso</string>
     <string name="lblNotificationMalwareDetectionDescription">Sirve para alertar cuando se detecta software malicioso</string>
     <string name="lblNotificationRealtimeTitle">Escáner en tiempo real</string>

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

@@ -15,8 +15,8 @@
     <string name="lblDatabaseServer">Kasuta muud andmekogu</string>
     <string name="lblScanSystem">Kontrolli /system kausta</string>
     <string name="lblScanApps">Kontrolli rakenduste apk-faile</string>
-    <string name="lblScanInternal">Kontrolli sisemist andmekogu</string>
     <string name="lblScanExternal">Kontrolli välist andmekogu</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Tuvasta pahavara</string>
     <string name="lblNotificationMalwareDetectionDescription">Kasutusel hoiatamaks pahavara tuvastamisel</string>
     <string name="lblNotificationRealtimeTitle">Kontrolli reaalajas</string>

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

@@ -10,8 +10,8 @@
     <string name="lblFullCredits">Krediitit</string>
     <string name="lblScanSystem">Tarkista /järjestelmä</string>
     <string name="lblScanApps">Tarkista sovellus APK:t</string>
-    <string name="lblScanInternal">Tarkista sisäinen tallennustila</string>
     <string name="lblScanExternal">Tarkista ulkoinen tallennustila</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Haittaohjelmien tunnistus</string>
     <string name="lblNotificationMalwareDetectionDescription">Käytetään hälyttämään, kun haittaohjelma havaitaan</string>
     <string name="lblNotificationRealtimeTitle">Reaaliaikainen tarkistus</string>

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

@@ -12,8 +12,8 @@
     <string name="lblFullCredits">Crédits</string>
     <string name="lblScanSystem">Analyser le /système</string>
     <string name="lblScanApps">Analyser les APK des applis</string>
-    <string name="lblScanInternal">Analyser la mémoire interne</string>
     <string name="lblScanExternal">Analyser la mémoire externe</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Détection des logiciels malveillants</string>
     <string name="lblNotificationMalwareDetectionDescription">Utilisé pour alerter lorsqu\'un logiciel malveillant est détecté</string>
     <string name="lblNotificationRealtimeTitle">Analyser en temps réel</string>

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

@@ -8,7 +8,7 @@
     <string name="lblDatabaseServer">Sobreescribir servidor BDD</string>
     <string name="lblFullCredits">Crédito</string>
     <string name="lblScanApps">Examinar APKs de App</string>
-    <string name="lblScanExternal">Examinar Almacenaxe Externa</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationRealtimeStopped">Hypatia: Detívose o Exame en tempo real</string>
     <string name="lblReset">Restablecer</string>
     <string name="lblOverride">Sobreescribir</string>
@@ -34,7 +34,7 @@
     <string name="main_files_pending_scan">%s ficheiros pendentes do exame</string>
     <string name="main_database_loading">A cargar base de datos…</string>
     <string name="app_copyright">Copyright 2017-2024 Divested Computing Group</string>
-    <string name="lblScanInternal">Examinar Almacenaxe Interna</string>
+    <string name="lblScanExternal">Examinar Almacenaxe Externa</string>
     <string name="app_version">Versión: %s</string>
     <string name="lblScanSystem">Examinar /system</string>
     <string name="lblUpdateDatabase">Actualizar bases de datos</string>

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

@@ -7,7 +7,7 @@
     <string name="lblUpdateDatabase">Ažurirajte baze podataka</string>
     <string name="lblScanSystem">Skeniraj /sustav</string>
     <string name="lblScanApps">Skenirajte APK-ove aplikacija</string>
-    <string name="lblScanExternal">Skeniraj vanjsku pohranu</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Otkrivanje zlonamjernog softvera</string>
     <string name="lblNotificationRealtimeTitle">Skener u stvarnom vremenu</string>
     <string name="lblNotificationRealtimeDetection">Otkriven zlonamjerni softver:</string>
@@ -41,7 +41,7 @@
     <string name="confirm_link_scanner_title">Omogućiti skener veza?</string>
     <string name="app_license">Licenca: GPL-3.0</string>
     <string name="lblFullCredits">Zasluge</string>
-    <string name="lblScanInternal">Skeniraj unutarnju pohranu</string>
+    <string name="lblScanExternal">Skeniraj vanjsku pohranu</string>
     <string name="lblNotificationMalwareDetectionDescription">Koristi se za upozorenje kada se otkrije zlonamjerni softver</string>
     <string name="lblNotificationRealtimeText">Poznati zlonamjerni softver bit će otkriven u stvarnom vremenu</string>
     <string name="lblNotificationRealtimeStopped">Hypatia: Zaustavljeno skeniranje u stvarnom vremenu</string>

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

@@ -13,8 +13,8 @@
     <string name="lblScanSystem">Pindai /sistem</string>
     <string name="lblScanApps">Pindai berkas APK aplikasi</string>
     <string name="lblOnionRoutingEnabledHint">Mengunduh dalam jaringan Tor. Proses ini akan memakan waktu…</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblScanExternal">Pindai Penyimpanan Eksternal</string>
-    <string name="lblScanInternal">Pindai Penyimpanan Internal</string>
     <string name="lblNotificationMalwareDetectionTitle">Deteksi Perangkat Perusak (Malware)</string>
     <string name="lblNotificationRealtimeDescription">Digunakan untuk menampilkan jumlah berkas yang dipindai dan mempertahankan agar aplikasi berjalan di latar</string>
     <string name="lblNotificationRealtimeText">Notifikasi perangkat perusak yang terdeteksi dalam waktu langsung</string>

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

@@ -11,8 +11,8 @@
     <string name="lblFullCredits">Riconoscimenti</string>
     <string name="lblScanSystem">Scansiona le app di sistema</string>
     <string name="lblScanApps">Scansiona le app</string>
-    <string name="lblScanInternal">Scansiona la memoria interna</string>
     <string name="lblScanExternal">Scansiona la memoria esterna</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Malware rilevato</string>
     <string name="lblNotificationMalwareDetectionDescription">Indica quando il malware è rilevato</string>
     <string name="lblNotificationRealtimeTitle">Scansione in tempo reale</string>

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

@@ -54,10 +54,10 @@
     <string name="lblFullCredits">קרדיטים</string>
     <string name="main_database_not_changed">קובץ לא השתנה</string>
     <string name="lblNotificationRealtimeStopped">Hypatia: הסריקה בזמן אמת הופסקה</string>
-    <string name="lblScanExternal">סרוק אחסון חיצוני</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblScanApps">סריקת אפליקציות APKs</string>
     <string name="lblDatabaseServer">עקיפה של שרת מסד הנתונים</string>
-    <string name="lblScanInternal">סרוק אחסון פנימי</string>
+    <string name="lblScanExternal">סרוק אחסון חיצוני</string>
     <string name="lblOverride">עקיפה</string>
     <string name="lblSigningKey">מפתח חתימת מסד נתונים</string>
     <string name="lblScanSystem">סריקה /system</string>

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

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

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

@@ -12,8 +12,8 @@
     <string name="lblFullCredits">Uznania</string>
     <string name="lblScanSystem">Skanuj /system</string>
     <string name="lblScanApps">Skanuj pliki APK aplikacji</string>
-    <string name="lblScanInternal">Skanuj pamięć wewnętrzną</string>
     <string name="lblScanExternal">Skanuj pamięć zewnętrzną</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Wykrywanie złośliwego oprogramowania</string>
     <string name="lblNotificationMalwareDetectionDescription">Wykorzystywane do informowania, gdy wykryto złośliwe oprogramowanie</string>
     <string name="lblNotificationRealtimeTitle">Skaner w czasie rzeczywistym</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -12,8 +12,8 @@
     <string name="lblFullCredits">Créditos</string>
     <string name="lblScanSystem">Buscar /system</string>
     <string name="lblScanApps">Buscar APKs dos apps</string>
-    <string name="lblScanInternal">Buscar armazenamento interno</string>
     <string name="lblScanExternal">Buscar armazenamento externo</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Detecção de Malware</string>
     <string name="lblNotificationMalwareDetectionDescription">Usado para alertar quando malware é detectado</string>
     <string name="lblNotificationRealtimeTitle">Busca em Tempo Real</string>

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

@@ -10,8 +10,8 @@
     <string name="lblFullCredits">Créditos</string>
     <string name="lblScanSystem">Analisar /sistema</string>
     <string name="lblScanApps">Analisar APKs do App</string>
-    <string name="lblScanInternal">Analisar memória interna</string>
     <string name="lblScanExternal">Analisar memória externa</string>
+    <string name="lblScanRemovable">Scan Removable Storage</string>
     <string name="lblNotificationMalwareDetectionTitle">Detecção de malwares</string>
     <string name="lblNotificationMalwareDetectionDescription">Usado para alertar quando um malware é detectado</string>
     <string name="lblNotificationRealtimeTitle">Análise em tempo real</string>