From 1ffb559af0f4b6ce9afdfd13a6f829629bb79bfc Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Wed, 16 Dec 2020 10:36:47 +0100
Subject: [PATCH] EN: Adjust export UI

---
 .../src/main/res/values-de/strings.xml                   | 7 ++++---
 .../src/main/res/values/strings.xml                      | 7 ++++---
 .../res/xml/preferences_exposure_notifications_rpis.xml  | 9 ++++-----
 .../gms/nearby/exposurenotification/ExposureDatabase.kt  | 2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/play-services-nearby-core-ui/src/main/res/values-de/strings.xml b/play-services-nearby-core-ui/src/main/res/values-de/strings.xml
index 9183c387..a80b38f4 100644
--- a/play-services-nearby-core-ui/src/main/res/values-de/strings.xml
+++ b/play-services-nearby-core-ui/src/main/res/values-de/strings.xml
@@ -30,11 +30,12 @@
     <string name="pref_exposure_app_api_usage_title">Nutzung der API in den letzten 14 Tagen</string>
     <string name="pref_exposure_app_api_usage_summary_line"><xliff:g example="12">%1$d</xliff:g> Aufrufe von <xliff:g example="provideDiagnosisKeys">%2$s</xliff:g></string>
     <string name="prefcat_exposure_rpis_histogram_title"><xliff:g example="230">%1$d</xliff:g> gesammelte IDs</string>
-    <string name="pref_exposure_rpi_delete_all_title">Alle gesammelten IDs löschen</string>
+    <string name="pref_exposure_rpi_delete_all_title">Löschen</string>
+    <string name="pref_exposure_rpi_delete_all_summary">Alle gesammelten IDs löschen</string>
     <string name="pref_exposure_rpi_delete_all_warning">Nach dem Löschen der gesammelten IDs kannst du nicht mehr informiert werden, falls einer deiner Kontakte der letzten 14 Tage positiv getested wurde.</string>
     <string name="pref_exposure_rpi_delete_all_warning_confirm_button">Trotzdem löschen</string>
-    <string name="pref_exposure_rpi_export_title">Datenbank Export</string>
-    <string name="pref_exposure_rpi_export_summary">Exportiere die aktuelle Datenbank um sie mit einer anderen App zu analysieren.</string>
+    <string name="pref_exposure_rpi_export_title">Exportieren</string>
+    <string name="pref_exposure_rpi_export_summary">Exportiere gesammelte IDs zur weiteren Analyse mit einer anderen App.</string>
     <string name="pref_exposure_info_summary">"Die Exposure Notifications API ermöglicht es Apps, dich zu warnen, falls du Kontakt zu einer positiv getesteten Person hattest.
 
 Das Datum, die Zeitdauer und die Signalstärke, die dem Kontakt zugeordnet sind, werden mit der zugehörigen App geteilt."</string>
diff --git a/play-services-nearby-core-ui/src/main/res/values/strings.xml b/play-services-nearby-core-ui/src/main/res/values/strings.xml
index 21a7b7a1..8b14db24 100644
--- a/play-services-nearby-core-ui/src/main/res/values/strings.xml
+++ b/play-services-nearby-core-ui/src/main/res/values/strings.xml
@@ -40,11 +40,12 @@
     <string name="pref_exposure_app_api_usage_title">API usage in the last 14 days</string>
     <string name="pref_exposure_app_api_usage_summary_line"><xliff:g example="12">%1$d</xliff:g> calls to <xliff:g example="provideDiagnosisKeys">%2$s</xliff:g></string>
     <string name="prefcat_exposure_rpis_histogram_title"><xliff:g example="230">%1$d</xliff:g> IDs collected</string>
-    <string name="pref_exposure_rpi_delete_all_title">Delete all collected IDs</string>
+    <string name="pref_exposure_rpi_delete_all_title">Delete</string>
+    <string name="pref_exposure_rpi_delete_all_summary">Delete all collected IDs</string>
     <string name="pref_exposure_rpi_delete_all_warning">Deleting collected IDs will make it impossible to notify you in case any of your contacts of the last 14 days is diagnosed.</string>
     <string name="pref_exposure_rpi_delete_all_warning_confirm_button">Delete anyways</string>
-    <string name="pref_exposure_rpi_export_title">Export Database</string>
-    <string name="pref_exposure_rpi_export_summary">Export the current database for analysis with another app.</string>
+    <string name="pref_exposure_rpi_export_title">Export</string>
+    <string name="pref_exposure_rpi_export_summary">Export collected IDs for extended analysis with another app.</string>
     <string name="pref_exposure_info_summary">"Exposure Notifications API allows apps to notify you if you were exposed to someone who reported to be diagnosed positive.
 
 The date, duration, and signal strength associated with an exposure will be shared with the corresponding app."</string>
diff --git a/play-services-nearby-core-ui/src/main/res/xml/preferences_exposure_notifications_rpis.xml b/play-services-nearby-core-ui/src/main/res/xml/preferences_exposure_notifications_rpis.xml
index 63737f95..37168c0e 100644
--- a/play-services-nearby-core-ui/src/main/res/xml/preferences_exposure_notifications_rpis.xml
+++ b/play-services-nearby-core-ui/src/main/res/xml/preferences_exposure_notifications_rpis.xml
@@ -13,16 +13,15 @@
             android:key="pref_exposure_rpi_histogram"
             tools:layout="@layout/preference_bar_chart" />
     </PreferenceCategory>
-    <PreferenceCategory android:layout="@layout/preference_category_no_label">
-        <Preference
-            android:key="pref_exposure_rpi_delete_all"
-            android:title="@string/pref_exposure_rpi_delete_all_title" />
-    </PreferenceCategory>
     <PreferenceCategory android:layout="@layout/preference_category_no_label">
         <Preference
             android:key="pref_exposure_export_database"
             android:title="@string/pref_exposure_rpi_export_title"
             android:summary="@string/pref_exposure_rpi_export_summary" />
+        <Preference
+            android:key="pref_exposure_rpi_delete_all"
+            android:summary="@string/pref_exposure_rpi_delete_all_summary"
+            android:title="@string/pref_exposure_rpi_delete_all_title" />
     </PreferenceCategory>
     <PreferenceCategory android:layout="@layout/preference_category_no_label">
         <org.microg.gms.ui.TextPreference
diff --git a/play-services-nearby-core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt b/play-services-nearby-core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt
index 67107eae..61b3b5e4 100644
--- a/play-services-nearby-core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt
+++ b/play-services-nearby-core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt
@@ -975,7 +975,7 @@ class ExposureDatabase private constructor(private val context: Context) : SQLit
             // Create a new database which will store only the Advertisements table
             val exportDir = File(context.getCacheDir(), "exposureDatabase")
             exportDir.mkdir()
-            val exportFile = File(exportDir, "database.db")
+            val exportFile = File(exportDir, "exposure.db")
             if (exportFile.delete()) {
                 Log.d("EN-DB-Exporter", "Deleted old export database.")
             }