Refactor exception handing and format

Author: cpunion

android/src/main/java/com/idehub/GoogleAnalyticsBridge/GoogleAnalyticsBridge.java

@@ -485,8 +485,12 @@ public void createNewSession(String trackerId, String screenName) {
 
     @ReactMethod
     public void dispatch(Promise promise) {
-        GoogleAnalytics analytics = GoogleAnalytics.getInstance(getReactApplicationContext());
-        analytics.dispatchLocalHits();
-        promise.resolve(true);
+        GoogleAnalytics analytics = getAnalyticsInstance();
+        try {
+            analytics.dispatchLocalHits();
+            promise.resolve(true);
+        } catch (Exception ex) {
+            promise.reject(ex);
+        }
     }
 }

ios/RCTGoogleAnalyticsBridge/RCTGoogleAnalyticsBridge/RCTGoogleAnalyticsBridge.m

@@ -378,9 +378,13 @@ - (NSDictionary *)constantsToExport
 }
 
 RCT_EXPORT_METHOD(dispatch:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject) {
+                  reject:(RCTPromiseRejectBlock)reject) {
     [[GAI sharedInstance] dispatchWithCompletionHandler:^void(GAIDispatchResult result){
-        resolve(result != kGAIDispatchError ? @YES : @NO);
+        if (result != kGAIDispatchError) {
+            resolve(@YES);
+        } else {
+            reject(@"DISPATCH_FAILED", nil, RCTErrorWithMessage(@"Dispatch failed"));
+        }
     }];
 }
 

src/GoogleAnalyticsTracker.js

@@ -1,5 +1,7 @@
 import { GoogleAnalyticsBridge } from './NativeBridges';
 
+const DEFAULT_DISPATCH_TIMEOUT = 15000;
+
 /**
  * Custom dimensions accept only strings and numbers.
  * @param customDimensionVal
@@ -250,25 +252,25 @@ export class GoogleAnalyticsTracker {
   }
 
   dispatch() {
-    return GoogleAnalyticsBridge.dispatch()
+    return GoogleAnalyticsBridge.dispatch();
   }
 
   dispatchWithTimeout(timeout = -1) {
     if (timeout < 0) {
-      return this.dispatch()
+      return GoogleAnalyticsBridge.dispatch();
     }
 
     const withTimeout = timeout => (
       new Promise(resolve => {
         setTimeout(() => {
-          resolve()
-        }, (timeout > 15000) ? 15000 : timeout)
+          resolve();
+        }, Math.min(timeout, DEFAULT_DISPATCH_TIMEOUT));
       })
-    )
+    );
 
     return Promise.race([
       GoogleAnalyticsBridge.dispatch(),
       withTimeout(timeout)
-    ])
+    ]);
   }
 }