From a55c9a969bc9f38f2c7901e4d38efc6b2584bcf4 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Fri, 8 Oct 2021 14:01:13 +1100
Subject: [PATCH] refactor: replace settings string for sharing logs, change
 extension to .txt to make things easier

---
 app/build.gradle                                                | 2 +-
 .../org/thoughtcrime/securesms/preferences/SettingsActivity.kt  | 2 +-
 .../org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt   | 2 +-
 app/src/main/res/layout/activity_settings.xml                   | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cb201213fb..14a6558205 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -154,7 +154,7 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 227
+def canonicalVersionCode = 228
 def canonicalVersionName = "1.11.11"
 
 def postFixSize = 10
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index a45efbc290..b34fc5a220 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -85,7 +85,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         helpTranslateButton.setOnClickListener { helpTranslate() }
         seedButton.setOnClickListener { showSeed() }
         clearAllDataButton.setOnClickListener { clearAllData() }
-        supportButton.setOnClickListener { shareLogs() }
+        debugLogButton.setOnClickListener { shareLogs() }
         val isLightMode = UiModeUtilities.isDayUiMode(this)
         oxenLogoImageView.setImageResource(if (isLightMode) R.drawable.oxen_light_mode else R.drawable.oxen_dark_mode)
         versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
index 9ff7ebbc43..09611e0efe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
@@ -40,7 +40,7 @@ class ShareLogsDialog : BaseDialog() {
             val persistentLogger = ApplicationContext.getInstance(context).persistentLogger
             try {
                 val logs = persistentLogger.logs.get()
-                val fileName = "${Build.MANUFACTURER}-${Build.DEVICE}-API${Build.VERSION.SDK_INT}-v${BuildConfig.VERSION_NAME}.log"
+                val fileName = "${Build.MANUFACTURER}-${Build.DEVICE}-API${Build.VERSION.SDK_INT}-v${BuildConfig.VERSION_NAME}.txt"
                 val logUri = BlobProvider().forData(logs.toByteArray())
                     .withFileName(fileName)
                     .withMimeType("text/plain")
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 706e4961b0..dc70771b0a 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -229,7 +229,7 @@
 
             <TextView
                 android:padding="@dimen/small_spacing"
-                android:id="@+id/supportButton"
+                android:id="@+id/debugLogButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/medium_spacing"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f376e3ddb..1319eeb37d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -899,7 +899,7 @@
     <string name="delete_message_for_everyone">Delete for everyone</string>
     <string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
     <string name="activity_settings_survey_feedback">Feedback/Survey</string>
-    <string name="activity_settings_support">Support</string>
+    <string name="activity_settings_support">Debug Log</string>
     <string name="dialog_share_logs_title">Share Logs</string>
     <string name="dialog_share_logs_explanation">Would you like to export your application logs to be able to share for troubleshooting?</string>