Use existing escape code

getodk · Nov 19, 2019 · 23703f1 · 23703f1
1 parent 0b07147
commit 23703f1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/audit/AuditEvent.java b/collect_app/src/main/java/org/odk/collect/android/formentry/audit/AuditEvent.java
@@ -244,12 +244,11 @@ public String toString() {
         }
 
         if (user != null) {
-            String escapedUser = user.replace("\"", "\"\"");
-            if (escapedUser.contains(",")) {
-                escapedUser = "\"" + escapedUser + "\"";
+            if (user.contains(",") || user.contains("\n")) {
+                string += String.format(",%s", getEscapedValueForCsv(user));
+            } else {
+                string += String.format(",%s", user);
             }
-
-            string += String.format(",%s", escapedUser);
         }
 
         return string;