From fd5f2a82eb968b5d50f586925ebb705249062446 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Wed, 10 Jan 2018 22:13:28 -0500
Subject: Misc (#614)

* Add locale log

* Add flyweight design for authenticator

* Add option to have instant messages only

* Update interceptor

* Add hd image model loader (#613)

* Launch image view for view full image

* Update changelog

* Greatly improve ImageActivity loading

* Update hashes

* Add back keyword filter

* Clean up
---
 .../com/pitchedapps/frost/services/FrostNotifications.kt       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index 50392dea..e8c5e7c1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -19,7 +19,6 @@ import android.support.v4.app.NotificationManagerCompat
 import ca.allanwang.kau.utils.color
 import ca.allanwang.kau.utils.dpToPx
 import ca.allanwang.kau.utils.string
-import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 import com.pitchedapps.frost.BuildConfig
@@ -31,7 +30,7 @@ import com.pitchedapps.frost.dbflow.lastNotificationTime
 import com.pitchedapps.frost.enums.OverlayContext
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.glide.FrostGlide
-import com.pitchedapps.frost.glide.transform
+import com.pitchedapps.frost.glide.GlideApp
 import com.pitchedapps.frost.parsers.FrostParser
 import com.pitchedapps.frost.parsers.MessageParser
 import com.pitchedapps.frost.parsers.NotifParser
@@ -146,7 +145,10 @@ enum class NotificationType(
     fun fetch(context: Context, data: CookieModel) {
         val response = parser.parse(data.cookie)
                 ?: return L.v { "$name notification data not found" }
-        val notifs = response.data.getUnreadNotifications(data)
+        val notifs = response.data.getUnreadNotifications(data).filter {
+            val text = it.text
+            Prefs.notificationKeywords.any { text.contains(it, true) }
+        }
         if (notifs.isEmpty()) return
         var notifCount = 0
         val userId = data.id
@@ -201,7 +203,7 @@ enum class NotificationType(
             if (profileUrl != null) {
                 context.runOnUiThread {
                     //todo verify if context is valid?
-                    Glide.with(context)
+                    GlideApp.with(context)
                             .asBitmap()
                             .load(profileUrl)
                             .transform(FrostGlide.circleCrop)
-- 
cgit v1.2.3