[alohalytics][android] Upload events only if we are connected to the network.

1 files changed, 11 insertions, 1 deletions

diff --git a/3party/Alohalytics/src/android/java/org/alohalytics/SystemInfo.java b/3party/Alohalytics/src/android/java/org/alohalytics/SystemInfo.java
index c891246df2..efc051805f 100644
--- a/3party/Alohalytics/src/android/java/org/alohalytics/SystemInfo.java
+++ b/3party/Alohalytics/src/android/java/org/alohalytics/SystemInfo.java
@@ -63,7 +63,17 @@ public class SystemInfo {
         collectIds(context);
         collectDeviceDetails(context);
         // Force statistics uploading because if user immediately uninstalls the app we won't even know about installation.
-        Statistics.forceUpload();
+        // But do it only if we are already connected to any network.
+        try {
+          final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+          final NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+          if (networkInfo != null && networkInfo.isConnected()) {
+            Statistics.forceUpload();
+          }
+        }
+        catch(Exception ex) {
+          handleException(ex);
+        }
       }
     }).start();
   }