diff --git a/collect_app/src/main/java/org/odk/collect/android/tasks/InstanceGoogleSheetsUploader.java b/collect_app/src/main/java/org/odk/collect/android/tasks/InstanceGoogleSheetsUploader.java index ead7a8ad413..baa510403e5 100644 --- a/collect_app/src/main/java/org/odk/collect/android/tasks/InstanceGoogleSheetsUploader.java +++ b/collect_app/src/main/java/org/odk/collect/android/tasks/InstanceGoogleSheetsUploader.java @@ -105,16 +105,6 @@ public InstanceGoogleSheetsUploader(GoogleAccountsManager accountsManager) { driveHelper = accountsManager.getDriveHelper(); } - /** - * Google sheets currently only allows a-zA-Z0-9 and dash - */ - public static boolean isGoogleSheetsStringValid(String name) { - return Pattern - .compile("^[a-zA-Z0-9\\-]+$") - .matcher(name) - .matches(); - } - public static boolean isLocationValid(String answer) { return Pattern .compile("^-?[0-9]+\\.[0-9]+\\s-?[0-9]+\\.[0-9]+\\s-?[0-9]+\\" @@ -282,9 +272,6 @@ private boolean fillSheet(List columnElements, String sheetTitle, if (!isNumberOfColumnsValid(columnTitles.size())) { return false; } - if (!areColumnTitlesValid(columnTitles)) { - return false; - } Multimap answersToUpload = ArrayListMultimap.create(); Multimap mediaToUpload = ArrayListMultimap.create(); Multimap uploadedMedia = ArrayListMultimap.create(); @@ -528,18 +515,6 @@ private void insertRow(ValueRange row, String sheetName) throws IOException { } } - private boolean areColumnTitlesValid(List columnNames) { - for (String columnName : columnNames) { - if (!isGoogleSheetsStringValid(columnName)) { - outcome.results.put(id, - Collect.getInstance().getString(R.string.google_sheets_invalid_column_form, - columnName)); - return false; - } - } - return true; - } - private void setUpSpreadsheet(String urlString) throws IOException, BadUrlException { if (!hasWritePermissionToSheet || !urlString.equals(googleSheetsUrl)) { try { diff --git a/collect_app/src/test/java/org/odk/collect/android/utilities/InstanceGoogleSheetsUploaderTest.java b/collect_app/src/test/java/org/odk/collect/android/utilities/InstanceGoogleSheetsUploaderTest.java index 02458bfa24d..cb13ecc25c8 100644 --- a/collect_app/src/test/java/org/odk/collect/android/utilities/InstanceGoogleSheetsUploaderTest.java +++ b/collect_app/src/test/java/org/odk/collect/android/utilities/InstanceGoogleSheetsUploaderTest.java @@ -1,25 +1,12 @@ package org.odk.collect.android.utilities; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.odk.collect.android.tasks.InstanceGoogleSheetsUploader; - public class InstanceGoogleSheetsUploaderTest { - @Test - public void googleSheetRegexTests() { - assertFalse(InstanceGoogleSheetsUploader.isGoogleSheetsStringValid("()(")); - assertFalse(InstanceGoogleSheetsUploader.isGoogleSheetsStringValid("-@123")); - assertFalse(InstanceGoogleSheetsUploader.isGoogleSheetsStringValid(";'[@%2789")); - assertFalse(InstanceGoogleSheetsUploader.isGoogleSheetsStringValid("&googlesheets")); - assertTrue(InstanceGoogleSheetsUploader.isGoogleSheetsStringValid("1234")); - assertTrue(InstanceGoogleSheetsUploader.isGoogleSheetsStringValid("googlesheet")); - assertTrue(InstanceGoogleSheetsUploader.isGoogleSheetsStringValid("Google")); - } - @Test public void gpsLocationRegexTests() { assertFalse(InstanceGoogleSheetsUploader.isLocationValid("{}{")); @@ -33,5 +20,4 @@ public void gpsLocationRegexTests() { assertTrue(InstanceGoogleSheetsUploader.isLocationValid("-0.0 0.8 -9.7 9.9")); assertTrue(InstanceGoogleSheetsUploader.isLocationValid("8.0 0.8 8.7 8.9")); } - } \ No newline at end of file