From 1369aa283a2167cf2a9525bd856edd48c39eea21 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 7 Oct 2017 15:15:10 -0400
Subject: Add more css hiders (#373)

* Add more css hiders

* Add toggles and injectors

* Fix composer hider

* Update changelog
---
 app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
index 9fafbf88..a29ff55e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
@@ -1,6 +1,7 @@
 package com.pitchedapps.frost.injectors
 
 import android.webkit.WebView
+import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.web.FrostWebViewClient
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -55,9 +56,10 @@ fun WebView.jsInject(vararg injectors: InjectorContract, callback: ((Array<Strin
     val validInjectors = injectors.filter { it != JsActions.EMPTY }
     if (validInjectors.isEmpty()) return callback(emptyArray())
     val observables = Array(validInjectors.size, { SingleSubject.create<String>() })
-    Observable.zip<String, Array<String>>(observables.map { it.toObservable() }, { it.map { it.toString() }.toTypedArray() }).subscribeOn(AndroidSchedulers.mainThread()).subscribe({
-        callback(it)
-    })
+    L.d("Injecting ${observables.size} items")
+    Observable.zip<String, Array<String>>(observables.map(SingleSubject<String>::toObservable),
+            { it.map(Any::toString).toTypedArray() })
+            .subscribeOn(AndroidSchedulers.mainThread()).subscribe({ callback(it) })
     (0 until validInjectors.size).forEach { i -> validInjectors[i].inject(this, { observables[i].onSuccess(it) }) }
 }
 
-- 
cgit v1.2.3