From 553eaaeac0e6719f32fd19f6d36c3ff7844ed499 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Thu, 13 Feb 2020 21:28:03 -0500
Subject: [PATCH] [ion] Fix telemetry on iOS and Android

---
 ion/src/simulator/android/src/cpp/telemetry.cpp |  8 ++------
 ion/src/simulator/ios/telemetry.mm              | 11 ++++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ion/src/simulator/android/src/cpp/telemetry.cpp b/ion/src/simulator/android/src/cpp/telemetry.cpp
index ddd815f27..e273c73a3 100644
--- a/ion/src/simulator/android/src/cpp/telemetry.cpp
+++ b/ion/src/simulator/android/src/cpp/telemetry.cpp
@@ -7,10 +7,10 @@ static inline JNIEnv * AndroidJNI() {
 }
 
 static inline jobject AndroidActivity() {
-  return static_cast<jobject>(SDL_AndroidGetActivity())
+  return static_cast<jobject>(SDL_AndroidGetActivity());
 }
 
-static inline JS(const char * s, JNIEnv * env) {
+static inline jstring JS(const char * s, JNIEnv * env) {
   return env->NewStringUTF(s);
 }
 
@@ -34,10 +34,6 @@ void shutdown() {
 }
 }
 
-static inline JS(const char * s, JNIEnv * env) {
-  return env->NewStringUTF(s);
-}
-
 namespace Ion {
 namespace Telemetry {
 
diff --git a/ion/src/simulator/ios/telemetry.mm b/ion/src/simulator/ios/telemetry.mm
index 87d0de708..9bda18b9f 100644
--- a/ion/src/simulator/ios/telemetry.mm
+++ b/ion/src/simulator/ios/telemetry.mm
@@ -4,13 +4,14 @@
 #import <GAIDictionaryBuilder.h>
 #import <GAIFields.h>
 
-class Ion {
-class Simulator {
-class Telemetry {
+namespace Ion {
+namespace Simulator {
+namespace Telemetry {
 
 void init() {
   [[GAI sharedInstance] trackerWithTrackingId:@"UA-93775823-3"];
 }
+
 void shutdown() {
 }
 
@@ -26,8 +27,8 @@ static inline NSString * NS(const char * s) {
   }
 }
 
-class Ion {
-class Telemetry {
+namespace Ion {
+namespace Telemetry {
 
 void reportScreen(const char * screenName) {
   id<GAITracker> tracker = [GAI sharedInstance].defaultTracker;