Rx tidy

Author: subsymbolic

app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt

@@ -29,7 +29,7 @@ import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter.FAILURE_COUNT
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter.TOTAL_COUNT
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
 import io.reactivex.Completable
-import io.reactivex.Completable.fromAction
+import io.reactivex.Completable.*
 import timber.log.Timber
 import java.io.IOException
 import javax.inject.Inject
@@ -114,20 +114,21 @@ class HttpsUpgradeDataDownloader @Inject constructor(
     }
 
     fun reportUpgradeStatistics(): Completable {
-        return fromAction {
+        return defer {
 
             if (statisticsDataStore.httpsUpgradesTotal == 0) {
-                return@fromAction
+                return@defer complete()
             }
             val params = mapOf(
                 TOTAL_COUNT to statisticsDataStore.httpsUpgradesTotal.toString(),
                 FAILURE_COUNT to statisticsDataStore.httpsUpgradesFailures.toString()
             )
 
-            pixel.fireCompletable(Pixel.PixelName.HTTPS_UPGRADE_SITE_SUMMARY, params).blockingGet()
-            Timber.v("Sent https statistics")
-            statisticsDataStore.httpsUpgradesTotal = 0
-            statisticsDataStore.httpsUpgradesFailures = 0
+            pixel.fireCompletable(Pixel.PixelName.HTTPS_UPGRADE_SITE_SUMMARY, params).andThen {
+                Timber.v("Sent https statistics")
+                statisticsDataStore.httpsUpgradesTotal = 0
+                statisticsDataStore.httpsUpgradesFailures = 0
+            }
         }
     }