v1.4.5 (#174)v1.4.5

* Update/kau (#125)

* Update logger

* Clean imports and bring back reactive libs

* Update dependencies and make billing async

* Misc (#128)

* Update null

* Attempt to improve transparent theme backgrounds

* Update menu

* Move injections to visible method and reduce offset

* Update searchview and logging

* Clean temp strings and add network states

* Move console blacklist to web state

* Change some logs to info

* Move glide loader to onCreate (#135)

* Remove commit number increments (#139)

* Fix/misc (#140)

* Add canadian locale to toLowerCase

* Add try catch to JsAssets

* Disable error throwing for bad search subject

* Log more throwables quietly

* Check internet connection before fetching username

* Remove name check in frost notifications

* Add activity lifecycle logger

* Add rxjava to lib showcase

* Move network checker to io thread (#150)

* Update dependency

* Blank

* Feature/jsoup debugger (#152)

* Create debugger

* Update debugger content

* Create debugging logic

* Finalize and test debugger

* Add reload listener

* Fix/pro crash without play store (#155)

* Update changelog

* Check if iab service exists

* Add checker before launching play store request

* Separate strings

* Enhancement/message notifications (#157)

* Map message notifs to the headless html extractor

* Update strings

* Bring im notifs out of alpha

* Update changelog

* Remove confirmation dialog (#159)

* Separate message notifications and add click intents (#171)

* Separate message notifications and add click intent for group notifications

* Add comments and finalize

* Feature/scroll down on message thread (#172)

* Add hook for scroll

* Update changelog

* Add custom navdrawer layout (#173)

* Add faq for auto play

* Update changelog

* Fix page banner bg (#163)

1 files changed, 29 insertions, 21 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 0992a9cb..733bc151 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
@@ -3,7 +3,10 @@ package com.pitchedapps.frost.injectors
 import android.graphics.Color
 import android.webkit.WebView
 import ca.allanwang.kau.utils.*
+import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
+import java.io.FileNotFoundException
+import java.util.*
 
 /**
  * Created by Allan Wang on 2017-05-31.
@@ -14,33 +17,38 @@ enum class CssAssets(val folder: String = "themes") : InjectorContract {
     MATERIAL_LIGHT, MATERIAL_DARK, MATERIAL_AMOLED, MATERIAL_GLASS, CUSTOM, ROUND_ICONS("components")
     ;
 
-    var file = "${name.toLowerCase()}.compact.css"
+    var file = "${name.toLowerCase(Locale.CANADA)}.compact.css"
     var injector: JsInjector? = null
 
     override fun inject(webView: WebView, callback: ((String) -> Unit)?) {
         if (injector == null) {
-            var content = webView.context.assets.open("css/$folder/$file").bufferedReader().use { it.readText() }
-            if (this == CUSTOM) {
-                var bbt = Prefs.bgColor
-                val bt: String
-                if (Color.alpha(bbt) == 255) {
-                    bbt = bbt.adjustAlpha(0.2f).colorToForeground(0.35f)
-                    bt = Prefs.bgColor.toRgbaString()
-                } else {
-                    bbt = bbt.adjustAlpha(0.05f).colorToForeground(0.5f)
-                    bt = "transparent"
+            try {
+                var content = webView.context.assets.open("css/$folder/$file").bufferedReader().use { it.readText() }
+                if (this == CUSTOM) {
+                    var bbt = Prefs.bgColor
+                    val bt: String
+                    if (Color.alpha(bbt) == 255) {
+                        bbt = bbt.adjustAlpha(0.2f).colorToForeground(0.35f)
+                        bt = Prefs.bgColor.toRgbaString()
+                    } else {
+                        bbt = bbt.adjustAlpha(0.05f).colorToForeground(0.5f)
+                        bt = "transparent"
+                    }
+                    content = content
+                            .replace("\$T\$", Prefs.textColor.toRgbaString())
+                            .replace("\$TT\$", Prefs.textColor.colorToBackground(0.05f).toRgbaString())
+                            .replace("\$B\$", Prefs.bgColor.toRgbaString())
+                            .replace("\$BT\$", bt)
+                            .replace("\$BBT\$", bbt.toRgbaString())
+                            .replace("\$O\$", Prefs.bgColor.withAlpha(255).toRgbaString())
+                            .replace("\$OO\$", Prefs.bgColor.colorToForeground(0.35f).withAlpha(255).toRgbaString())
+                            .replace("\$D\$", Prefs.textColor.adjustAlpha(0.3f).toRgbaString())
                 }
-                content = content
-                        .replace("\$T\$", Prefs.textColor.toRgbaString())
-                        .replace("\$TT\$", Prefs.textColor.colorToBackground(0.05f).toRgbaString())
-                        .replace("\$B\$", Prefs.bgColor.toRgbaString())
-                        .replace("\$BT\$", bt)
-                        .replace("\$BBT\$", bbt.toRgbaString())
-                        .replace("\$O\$", Prefs.bgColor.withAlpha(255).toRgbaString())
-                        .replace("\$OO\$", Prefs.bgColor.colorToForeground(0.35f).withAlpha(255).toRgbaString())
-                        .replace("\$D\$", Prefs.textColor.adjustAlpha(0.3f).toRgbaString())
+                injector = JsBuilder().css(content).build()
+            } catch (e: FileNotFoundException) {
+                L.e(e, "CssAssets file not found")
+                injector = JsInjector(JsActions.EMPTY.function)
             }
-            injector = JsBuilder().css(content).build()
         }
         injector!!.inject(webView, callback)
     }