Merge pull request #1341 from realm/ez-allow-disable-analytics

Ignore errors in analytics BG thread and allow disabling it
realm · Aug 3, 2015 · 337e763 · 337e763
2 parents b319f7e + b1e5b6b
commit 337e763
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/realm-annotations-processor/src/main/java/io/realm/processor/RealmAnalytics.java b/realm-annotations-processor/src/main/java/io/realm/processor/RealmAnalytics.java
@@ -16,7 +16,6 @@
 
 package io.realm.processor;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -97,8 +96,7 @@ private void send() {
             connection.setRequestMethod("GET");
             connection.connect();
             connection.getResponseCode();
-        } catch (IOException ignored) {
-        } catch (NoSuchAlgorithmException ignored) {
+        } catch (Exception ignored) {
         }
     }
 
@@ -112,7 +110,9 @@ public void run() {
         backgroundThread.start();
         try {
             backgroundThread.join(CONNECT_TIMEOUT + READ_TIMEOUT);
-        } catch (InterruptedException e) {
+        } catch (InterruptedException ignored) {
+            // We ignore this exception on purpose not to break the build system if this class fails
+        } catch (IllegalArgumentException ignored) {
             // We ignore this exception on purpose not to break the build system if this class fails
         }
     }

diff --git a/realm-annotations-processor/src/main/java/io/realm/processor/RealmProcessor.java b/realm-annotations-processor/src/main/java/io/realm/processor/RealmProcessor.java
@@ -148,8 +148,11 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             }
 	    }
 
-        RealmAnalytics analytics = RealmAnalytics.getInstance(packages);
-        analytics.execute();
+        String environmentVariable = System.getenv("REALM_DISABLE_ANALYTICS");
+        if (environmentVariable == null || !environmentVariable.equals("true")) {
+            RealmAnalytics analytics = RealmAnalytics.getInstance(packages);
+            analytics.execute();
+        }
 
         hasProcessedModules = true;
         return processModules(roundEnv);