From da173356c5465e98e3c61d4166eeadfd23872349 Mon Sep 17 00:00:00 2001
From: xynngh <xynngh@protonmail.com>
Date: Sat, 8 Aug 2020 16:43:49 +0400
Subject: [PATCH] Rename "Debug activity" to "DB management" and move it to
 settings

---
 app/src/main/AndroidManifest.xml                   |  9 ++-------
 ...ebugActivity.java => DbManagementActivity.java} |  6 +++---
 .../yetanothercallblocker/MainActivity.java        |  4 ----
 .../yetanothercallblocker/SettingsActivity.java    |  7 +++++++
 ...tivity_debug.xml => activity_db_management.xml} | 10 +++++-----
 app/src/main/res/menu/activity_main.xml            |  4 ----
 app/src/main/res/values-es/strings.xml             |  8 +++-----
 app/src/main/res/values-fr/strings.xml             | 12 +++++-------
 app/src/main/res/values-nl/strings.xml             |  8 +++-----
 app/src/main/res/values-ru/strings.xml             | 14 +++++++-------
 app/src/main/res/values-uk/strings.xml             | 12 +++++-------
 app/src/main/res/values/strings.xml                | 14 +++++++-------
 app/src/main/res/xml/root_preferences.xml          |  4 ++++
 13 files changed, 51 insertions(+), 61 deletions(-)
 rename app/src/main/java/dummydomain/yetanothercallblocker/{DebugActivity.java => DbManagementActivity.java} (96%)
 rename app/src/main/res/layout/{activity_debug.xml => activity_db_management.xml} (84%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0672a53..8ba8ff3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -66,13 +66,8 @@
                 android:value=".MainActivity" />
         </activity>
         <activity
-            android:name=".DebugActivity"
-            android:label="@string/debug_activity_label"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
-        </activity>
+            android:name=".DbManagementActivity"
+            android:label="@string/db_management_activity_label" />
         <activity
             android:name=".ReviewsActivity"
             android:label="@string/title_activity_reviews"
diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/DebugActivity.java b/app/src/main/java/dummydomain/yetanothercallblocker/DbManagementActivity.java
similarity index 96%
rename from app/src/main/java/dummydomain/yetanothercallblocker/DebugActivity.java
rename to app/src/main/java/dummydomain/yetanothercallblocker/DbManagementActivity.java
index f9f2aca..b9f28b5 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/DebugActivity.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/DbManagementActivity.java
@@ -20,14 +20,14 @@ import dummydomain.yetanothercallblocker.sia.model.database.CommunityDatabase;
 import dummydomain.yetanothercallblocker.sia.model.database.FeaturedDatabase;
 import dummydomain.yetanothercallblocker.work.TaskService;
 
-public class DebugActivity extends AppCompatActivity {
+public class DbManagementActivity extends AppCompatActivity {
 
     private AsyncTask<Void, Void, String> dbInfoTask;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_debug);
+        setContentView(R.layout.activity_db_management);
 
         onDbInfoButtonClick(null);
     }
@@ -55,7 +55,7 @@ public class DebugActivity extends AppCompatActivity {
 
     @Subscribe(threadMode = ThreadMode.MAIN_ORDERED)
     public void onSecondaryDbUpdateFinished(SecondaryDbUpdateFinished event) {
-        setResult(getString(R.string.debug_update_result,
+        setResult(getString(R.string.db_management_update_result,
                 YacbHolder.getCommunityDatabase().getEffectiveDbVersion()));
     }
 
diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java b/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java
index 8db3635..e06902c 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/MainActivity.java
@@ -205,10 +205,6 @@ public class MainActivity extends AppCompatActivity {
         startActivity(new Intent(this, SettingsActivity.class));
     }
 
-    public void onOpenDebugActivity(MenuItem item) {
-        startActivity(new Intent(this, DebugActivity.class));
-    }
-
     private void onCallLogItemClicked(CallLogItem item) {
         InfoDialogHelper.showDialog(this, item.numberInfo, null);
     }
diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/SettingsActivity.java b/app/src/main/java/dummydomain/yetanothercallblocker/SettingsActivity.java
index a072840..e38134f 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/SettingsActivity.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/SettingsActivity.java
@@ -102,6 +102,7 @@ public class SettingsActivity extends AppCompatActivity
         private static final String PREF_AUTO_UPDATE_ENABLED = "autoUpdateEnabled";
         private static final String PREF_CATEGORY_NOTIFICATIONS = "categoryNotifications";
         private static final String PREF_SCREEN_ADVANCED = "screenAdvanced";
+        private static final String PREF_DB_MANAGEMENT = "dbManagement";
         private static final String PREF_COUNTRY_CODES_INFO = "countryCodesInfo";
         private static final String PREF_EXPORT_LOGCAT = "exportLogcat";
 
@@ -213,6 +214,12 @@ public class SettingsActivity extends AppCompatActivity
         private void initAdvancedScreen(String rootKey) {
             if (!PREF_SCREEN_ADVANCED.equals(rootKey)) return;
 
+            requireNonNull((Preference) findPreference(PREF_DB_MANAGEMENT))
+                    .setOnPreferenceClickListener(preference -> {
+                        startActivity(new Intent(getActivity(), DbManagementActivity.class));
+                        return true;
+                    });
+
             String countryCodesExplanationSummary = getString(R.string.country_codes_info_summary)
                     + ". " + getString(R.string.country_codes_info_summary_addition,
                     App.getSettings().getCachedAutoDetectedCountryCode());
diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_db_management.xml
similarity index 84%
rename from app/src/main/res/layout/activity_debug.xml
rename to app/src/main/res/layout/activity_db_management.xml
index 49efc00..e1a3ad0 100644
--- a/app/src/main/res/layout/activity_debug.xml
+++ b/app/src/main/res/layout/activity_db_management.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DebugActivity">
+    tools:context=".DbManagementActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -15,13 +15,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:onClick="onDbInfoButtonClick"
-            android:text="@string/debug_db_info" />
+            android:text="@string/db_management_db_info" />
 
         <Button
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:onClick="onUpdateDbButtonClick"
-            android:text="@string/debug_update_db" />
+            android:text="@string/db_management_update_db" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -33,14 +33,14 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:onClick="onResetDbClick"
-                android:text="@string/debug_reset_base" />
+                android:text="@string/db_management_reset_base" />
 
             <Button
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:onClick="onResetSecondaryDbClick"
-                android:text="@string/debug_reset_secondary" />
+                android:text="@string/db_management_reset_secondary" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/menu/activity_main.xml b/app/src/main/res/menu/activity_main.xml
index 3d0845a..4724957 100644
--- a/app/src/main/res/menu/activity_main.xml
+++ b/app/src/main/res/menu/activity_main.xml
@@ -41,8 +41,4 @@
         android:onClick="onOpenSettings"
         android:title="@string/open_settings_activity" />
 
-    <item
-        android:onClick="onOpenDebugActivity"
-        android:title="@string/open_debug_activity" />
-
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b3a53b6..2cca4a2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -89,12 +89,10 @@
     <string name="use_contacts">Usar contactos</string>
     <string name="use_contacts_summary">Los números presentes en la guía telefónica nunca se bloquean y el nombre del contacto aparece junto a/en lugar de un número en toda la aplicación</string>
 
-    <string name="open_debug_activity">Abrir pantalla de depuración</string>
-    <string name="debug_activity_label">Operar con DB</string>
     <string name="lookup_query_db">Consulta DB</string>
     <string name="lookup_load_reviews">Cargar reseñas (online)</string>
-    <string name="debug_db_info">Información de DB</string>
-    <string name="debug_update_db">Actualizar DB</string>
+    <string name="db_management_db_info">Información de DB</string>
+    <string name="db_management_update_db">Actualizar DB</string>
     <string name="lookup_number_not_found">No encontrado</string>
-    <string name="debug_update_result">Actualización terminada; DB ver: %d</string>
+    <string name="db_management_update_result">Actualización terminada; DB ver: %d</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ac043f9..3c5b1a1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -127,13 +127,11 @@
     <string name="error">Erreur</string>
     <string name="no_number"><![CDATA[<aucun numéro>]]></string>
 
-    <string name="open_debug_activity">Ouvrir l\'écran de débogage</string>
-    <string name="debug_activity_label">Déboggage</string>
-    <string name="debug_db_info">Infos de la BD</string>
-    <string name="debug_reset_base">Réinitialiser la BD</string>
-    <string name="debug_reset_secondary">Réinitialiser les mises à jour</string>
-    <string name="debug_update_db">Mise à jour de la BD</string>
-    <string name="debug_update_result">Mise à jour terminée; BD ver: %d</string>
+    <string name="db_management_db_info">Infos de la BD</string>
+    <string name="db_management_reset_base">Réinitialiser la BD</string>
+    <string name="db_management_reset_secondary">Réinitialiser les mises à jour</string>
+    <string name="db_management_update_db">Mise à jour de la BD</string>
+    <string name="db_management_update_result">Mise à jour terminée; BD ver: %d</string>
 
     <string name="lookup_query_db">Interroger la DB</string>
     <string name="lookup_load_reviews">Charger les évaluations (en ligne)</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6e13050..00966ca 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -77,13 +77,11 @@
     <string name="auto_updates">Databank automatisch bijwerken</string>
     <string name="use_contacts">Contactpersonen uitlezen</string>
 
-    <string name="open_debug_activity">Foutopsporingsinformatie tonen</string>
-    <string name="debug_activity_label">Foutopsporing</string>
     <string name="lookup_query_db">Databank raadplegen</string>
     <string name="lookup_load_reviews">Online-recensies tonen</string>
-    <string name="debug_db_info">Databankinformatie</string>
-    <string name="debug_update_db">Databank bijwerken</string>
+    <string name="db_management_db_info">Databankinformatie</string>
+    <string name="db_management_update_db">Databank bijwerken</string>
     <string name="lookup_number_not_found">Niet gevonden</string>
-    <string name="debug_update_result">Bijwerken voltooid. Databankversie: %d</string>
+    <string name="db_management_update_result">Bijwerken voltooid. Databankversie: %d</string>
 
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 49724f6..1da09fa 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -33,13 +33,13 @@
     <string name="use_call_screening_service_disable_message">Выберите другое приложение для звонков или защиты от спама в меню Настройки - Приложения - Приложения по умолчанию</string>
     <string name="auto_updates">Авто-обновл. базы номеров</string>
     <string name="auto_updates_summary">Получать ежедневные обновления базы (загружаются только изменения, поэтому расход трафика небольшой)</string>
-    <string name="open_debug_activity">Работа с базой номеров</string>
-    <string name="debug_activity_label">Работа с базой номеров</string>
-    <string name="debug_db_info">Инфо об установленной базе</string>
-    <string name="debug_reset_base">Сбросить базу</string>
-    <string name="debug_reset_secondary">Сбросить обновления</string>
-    <string name="debug_update_db">Обновить базу вручную</string>
-    <string name="debug_update_result">Обновление завершено. Версия: %d</string>
+    <string name="open_db_management_activity">Управление базой</string>
+    <string name="db_management_activity_label">Управление базой</string>
+    <string name="db_management_db_info">Инфо об установленной базе</string>
+    <string name="db_management_reset_base">Сбросить базу</string>
+    <string name="db_management_reset_secondary">Сбросить обновления</string>
+    <string name="db_management_update_db">Обновить базу вручную</string>
+    <string name="db_management_update_result">Обновление завершено. Версия: %d</string>
     <string name="incoming_call_notifications">Отображ. уведомл. при входящих</string>
     <string name="incoming_call_notifications_summary">Отображает уведомление с краткой информацией о номере (рейтинги, кол-во отзывов, категория) при входящих вызовах</string>
     <string name="title_activity_reviews">Отзывы</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 23a0789..acf977f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -33,13 +33,11 @@
     <string name="use_call_screening_service_disable_message">Виберіть інший додаток для дзвінків або захисту від спаму в меню Налаштування - Додатки - Додатки за замовчуванням</string>
     <string name="auto_updates">Авто-оновл. бази номерів</string>
     <string name="auto_updates_summary">Отримувати щоденні оновлення бази (завантажуються тільки зміни, тому витрата трафіку невеликий)</string>
-    <string name="open_debug_activity">Робота з базою номерів</string>
-    <string name="debug_activity_label">Робота з базою номерів</string>
-    <string name="debug_db_info">Інфо про встановлену базу</string>
-    <string name="debug_reset_base">Скинути базу</string>
-    <string name="debug_reset_secondary">Скинути оновлення</string>
-    <string name="debug_update_db">Оновити базу самостійно</string>
-    <string name="debug_update_result">Оновлення завершено. Версія: %d</string>
+    <string name="db_management_db_info">Інфо про встановлену базу</string>
+    <string name="db_management_reset_base">Скинути базу</string>
+    <string name="db_management_reset_secondary">Скинути оновлення</string>
+    <string name="db_management_update_db">Оновити базу самостійно</string>
+    <string name="db_management_update_result">Оновлення завершено. Версія: %d</string>
     <string name="incoming_call_notifications">відображення вхідних дзвінків</string>
     <string name="incoming_call_notifications_summary">Показує повідомлення з короткою інформацією про номер (рейтинги, кількість відгуків, категорія) при вхідних дзвінках</string>
     <string name="title_activity_reviews">Відгуки</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a292e0b..501307e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -159,13 +159,13 @@
     <string name="info_in_blacklist_contact">In blacklist (contacts are not blocked)</string>
     <string name="add_to_blacklist">Add to blacklist</string>
 
-    <string name="open_debug_activity">Database operations</string>
-    <string name="debug_activity_label">Operate with DB</string>
-    <string name="debug_db_info">DB info</string>
-    <string name="debug_reset_base">Reset DB</string>
-    <string name="debug_reset_secondary">Reset updates</string>
-    <string name="debug_update_db">Update DB</string>
-    <string name="debug_update_result">Update finished; DB ver: %d</string>
+    <string name="open_db_management_activity">Manage database</string>
+    <string name="db_management_activity_label">DB management</string>
+    <string name="db_management_db_info">DB info</string>
+    <string name="db_management_reset_base">Reset DB</string>
+    <string name="db_management_reset_secondary">Reset updates</string>
+    <string name="db_management_update_db">Update DB</string>
+    <string name="db_management_update_result">Update finished; DB ver: %d</string>
 
     <string name="title_lookup_number">Lookup number</string>
     <string name="lookup_default_test_number" translatable="false">74995861192</string>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 81e5d3e..eac32b2 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -67,6 +67,10 @@
         <PreferenceScreen
             app:key="screenAdvanced"
             app:title="@string/settings_screen_advanced">
+            <Preference
+                app:key="dbManagement"
+                app:persistent="false"
+                app:title="@string/open_db_management_activity" />
             <PreferenceCategory
                 app:key="categoryCountryCodes"
                 app:title="@string/settings_category_country_codes">