Do not store events if collection is disabled. (#43)

mozilla-mobile · May 12, 2017 · 9f1e791 · 9f1e791
1 parent 2950124
commit 9f1e791
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/telemetry/src/main/java/org/mozilla/telemetry/Telemetry.java b/telemetry/src/main/java/org/mozilla/telemetry/Telemetry.java
@@ -51,13 +51,13 @@ public Telemetry addPingBuilder(TelemetryPingBuilder builder) {
     }
 
     public Telemetry queuePing(final String pingType) {
+        if (!configuration.isCollectionEnabled()) {
+            return this;
+        }
+
         executor.submit(new Runnable() {
             @Override
             public void run() {
-                if (!configuration.isCollectionEnabled()) {
-                    return;
-                }
-
                 final TelemetryPingBuilder pingBuilder = pingBuilders.get(pingType);
 
                 if (!pingBuilder.canBuild()) {
@@ -76,6 +76,10 @@ public void run() {
     }
 
     public Telemetry queueEvent(final TelemetryEvent event) {
+        if (!configuration.isCollectionEnabled()) {
+            return this;
+        }
+
         executor.submit(new Runnable() {
             @Override
             public void run() {
@@ -93,22 +97,18 @@ public void run() {
         return this;
     }
 
-    public TelemetryPingBuilder getBuilder(String pingType) {
-        return pingBuilders.get(pingType);
-    }
-
     public Collection<TelemetryPingBuilder> getBuilders() {
         return pingBuilders.values();
     }
 
     public Telemetry scheduleUpload() {
+        if (!configuration.isUploadEnabled()) {
+            return this;
+        }
+
         executor.submit(new Runnable() {
             @Override
             public void run() {
-                if (!configuration.isUploadEnabled()) {
-                    return;
-                }
-
                 scheduler.scheduleUpload(configuration);
             }
         });