logic for dot and dash

Author: Niall Brennan

src/main/java/com/segment/analytics/android/integrations/firebase/FirebaseIntegration.java

@@ -213,13 +213,13 @@ && isNullOrEmpty(properties.currency())) {
   }
 
   public static String makeKey(String key) {
-    if (key.contains(".")) {
-      key = key.trim().replace(".", "_");
-    } else if (key.contains("-")) {
-      key = key.trim().replace("-", "_");
-    } else {
-      key = key.trim().replaceAll(" ", "_");
+    String[] forbiddenChars = {".", "-", " "};
+    for (String forbidden : forbiddenChars) {
+      if (key.contains(forbidden)) {
+        key = key.trim().replace(forbidden, "_");
+      }
     }
+
     return key.substring(0, Math.min(key.length(), 40));
   }
 }

src/test/java/com/segment/analytics/android/integration/firebase/FirebaseTest.java

@@ -169,6 +169,12 @@ public void makeKeyWithDot() {
         verify(firebase).logEvent(eq("test_event"), bundleEq(new Bundle()));
     }
 
+    @Test
+    public void makeKeyWithDashAndDot() {
+        integration.track(new TrackPayload.Builder().anonymousId("12345").event("test-event-dashed-and.dotted").build());
+        verify(firebase).logEvent(eq("test_event_dashed_and_dotted"), bundleEq(new Bundle()));
+    }
+
     /**
      * Uses the string representation of the object. Useful for JSON objects.
      * @param expected Expected object