From c43b48c0cbb6850e91d2cd7a59da2613e1096766 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 6 Sep 2021 10:25:55 +0200
Subject: [PATCH] Added surrounding quotes for csv fields

---
 .../net/pokeranalytics/android/util/csv/CSVDescriptor.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt
index 11f1da03..e5e6b070 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt
@@ -99,8 +99,9 @@ abstract class DataCSVDescriptor<T : Identifiable>(source: DataSource, vararg el
 
 			val line = mutableListOf<String>()
 			this.fields.forEach { field ->
-				val string = this.toCSV(data, field)
-				line.add(string ?: "")
+				val string = this.toCSV(data, field) ?: ""
+				val surrounded = "\"$string\""
+				line.add(surrounded)
 			}
 			lines.add(line.joinToString(","))
 		}
@@ -185,7 +186,7 @@ abstract class CSVDescriptor(var source: DataSource, vararg elements: CSVField)
 		get() {
 			val headers = mutableListOf<String>()
 			this.fields.forEach {
-				headers.add(it.header)
+				headers.add("\"${it.header}\"")
 			}
 			return headers.joinToString(",")
 		}