From 9907e4429c7d86c309cecca8bdf01e863e0499a7 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 3 Jan 2020 15:20:38 +0200
Subject: [PATCH] Removed game settings from crash report, not very helpful

---
 android/src/com/unciv/app/AndroidLauncher.kt               | 2 +-
 ...civCrashReportSender.kt => CrashReportSenderAndroid.kt} | 7 +++----
 core/src/com/unciv/models/CrashReport.kt                   | 1 -
 core/src/com/unciv/ui/utils/CrashController.kt             | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename android/src/com/unciv/app/{UncivCrashReportSender.kt => CrashReportSenderAndroid.kt} (86%)

diff --git a/android/src/com/unciv/app/AndroidLauncher.kt b/android/src/com/unciv/app/AndroidLauncher.kt
index 2d24064e4b..8c01028a45 100644
--- a/android/src/com/unciv/app/AndroidLauncher.kt
+++ b/android/src/com/unciv/app/AndroidLauncher.kt
@@ -9,7 +9,7 @@ class AndroidLauncher : AndroidApplication() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val config = AndroidApplicationConfiguration().apply { useImmersiveMode = true }
-        val game = UncivGame(BuildConfig.VERSION_NAME, UncivCrashReportSender(this))
+        val game = UncivGame(BuildConfig.VERSION_NAME, CrashReportSenderAndroid(this))
         initialize(game, config)
     }
 }
\ No newline at end of file
diff --git a/android/src/com/unciv/app/UncivCrashReportSender.kt b/android/src/com/unciv/app/CrashReportSenderAndroid.kt
similarity index 86%
rename from android/src/com/unciv/app/UncivCrashReportSender.kt
rename to android/src/com/unciv/app/CrashReportSenderAndroid.kt
index 7e40beff5a..8741caa6c5 100644
--- a/android/src/com/unciv/app/UncivCrashReportSender.kt
+++ b/android/src/com/unciv/app/CrashReportSenderAndroid.kt
@@ -8,7 +8,7 @@ import android.widget.Toast
 import com.unciv.models.CrashReport
 import com.unciv.ui.utils.CrashReportSender
 
-class UncivCrashReportSender(private val activity: Activity) : CrashReportSender {
+class CrashReportSenderAndroid(private val activity: Activity) : CrashReportSender {
 
     companion object {
         private const val EMAIL_TO = "yairm210@hotmail.com"
@@ -19,8 +19,7 @@ class UncivCrashReportSender(private val activity: Activity) : CrashReportSender
                                        "Game version: %s\n" +
                                        "OS version: %s\n" +
                                        "Device model: %s\n" +
-                                       "Game data: %s\n" +
-                                       "Game settings: %s"
+                                       "Game data: %s\n"
     }
 
     override fun sendReport(report: CrashReport) {
@@ -42,5 +41,5 @@ class UncivCrashReportSender(private val activity: Activity) : CrashReportSender
     }
 
     private fun buildEmailBody(report: CrashReport): String =
-            EMAIL_BODY.format(report.version, Build.VERSION.SDK_INT, Build.MODEL, report.gameInfo, report.gameSettings)
+            EMAIL_BODY.format(report.version, Build.VERSION.SDK_INT, Build.MODEL, report.gameInfo)
 }
\ No newline at end of file
diff --git a/core/src/com/unciv/models/CrashReport.kt b/core/src/com/unciv/models/CrashReport.kt
index 152135befe..094e4d019c 100644
--- a/core/src/com/unciv/models/CrashReport.kt
+++ b/core/src/com/unciv/models/CrashReport.kt
@@ -2,6 +2,5 @@ package com.unciv.models
 
 data class CrashReport(
         val gameInfo: String,
-        val gameSettings: String,
         val version: String
 )
\ No newline at end of file
diff --git a/core/src/com/unciv/ui/utils/CrashController.kt b/core/src/com/unciv/ui/utils/CrashController.kt
index f404ccf294..b27b6ec007 100644
--- a/core/src/com/unciv/ui/utils/CrashController.kt
+++ b/core/src/com/unciv/ui/utils/CrashController.kt
@@ -61,8 +61,7 @@ interface CrashController {
         private fun buildReport(): CrashReport {
             return UncivGame.Current.run {
                 val zippedGameInfo = Json().toJson(gameInfo).let { Gzip.zip(it) }
-                val zippedGameSettings = Json().toJson(settings).let { Gzip.zip(it) }
-                CrashReport(zippedGameInfo, zippedGameSettings, version)
+                CrashReport(zippedGameInfo, version)
             }
         }
     }