diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-22 23:52:55 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-22 23:52:55 -0700 |
| commit | 7bb1de11f0208ac6b6a9e7d8fd3db81490e18daf (patch) | |
| tree | b84b8bb1157c2e94df6527b29f542a8f87f26ebe /app/src/main/kotlin/com/pitchedapps/frost/injectors | |
| parent | 41f3952896fe6235895ba6bbf3cefe0f72907a87 (diff) | |
| download | frost-7bb1de11f0208ac6b6a9e7d8fd3db81490e18daf.tar.gz frost-7bb1de11f0208ac6b6a9e7d8fd3db81490e18daf.tar.bz2 frost-7bb1de11f0208ac6b6a9e7d8fd3db81490e18daf.zip | |
Fix urls in overlay
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/injectors')
4 files changed, 1 insertions, 7 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt index 5cb9897e..4edddbed 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt @@ -22,7 +22,6 @@ enum class CssAssets(val folder: String = "themes") : InjectorContract { injector = JsBuilder().css(content).build() } injector!!.inject(webView, callback) - L.v("CSS ${injector!!.function}") } fun reset() { diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt index ba0bdaac..655da3ff 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt @@ -20,7 +20,6 @@ enum class CssHider(vararg val items: String) : InjectorContract { override fun inject(webView: WebView, callback: ((String) -> Unit)?) { injector.inject(webView, callback) - L.d(injector.function) } }
\ No newline at end of file diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt index 7bb73471..a176042e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt @@ -22,7 +22,6 @@ enum class JsAssets : InjectorContract { injector = JsBuilder().js(content).build() } injector!!.inject(webView, callback) - L.v("JS ${injector!!.function}") } fun reset() { 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 b7a162ae..deb6c0be 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt @@ -53,10 +53,7 @@ fun WebView.jsInject(vararg injectors: InjectorContract, callback: ((Array<Strin Observable.zip<String, Array<String>>(observables.map { it.toObservable() }, { it.map { it.toString() }.toTypedArray() }).subscribeOn(AndroidSchedulers.mainThread()).subscribe({ callback(it) }) - (0 until validInjectors.size).asSequence().forEach { - i -> - validInjectors[i].inject(this, { observables[i].onSuccess(it) }) - } + (0 until validInjectors.size).forEach { i -> validInjectors[i].inject(this, { observables[i].onSuccess(it) }) } } fun FrostWebViewClient.jsInject(vararg injectors: InjectorContract, callback: ((Array<String>) -> Unit) = {}) = webCore.jsInject(*injectors, callback = callback) |