1 files changed, 10 insertions, 7 deletions
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 2cea55b4..7b60a718 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -19,13 +19,10 @@ import com.bumptech.glide.request.transition.Transition
 import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.FrostWebActivity
 import com.pitchedapps.frost.R
-import com.pitchedapps.frost.WebOverlayActivity
 import com.pitchedapps.frost.dbflow.CookieModel
 import com.pitchedapps.frost.dbflow.fetchUsername
 import com.pitchedapps.frost.facebook.FB_URL_BASE
-import com.pitchedapps.frost.utils.GlideApp
-import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.utils.withRoundIcon
+import com.pitchedapps.frost.utils.*
 import org.jetbrains.anko.runOnUiThread
 
 /**
@@ -38,6 +35,12 @@ val Context.frostNotification: NotificationCompat.Builder
         color = color(R.color.frost_notification_accent)
     }
 
+fun Notification.frostConfig() = apply {
+    if (Prefs.notificationVibrate) defaults = defaults or Notification.DEFAULT_VIBRATE
+    if (Prefs.notificationSound) defaults = defaults or Notification.DEFAULT_SOUND
+    if (Prefs.notificationLights) defaults = defaults or Notification.DEFAULT_LIGHTS
+}
+
 val NotificationCompat.Builder.withBigText: NotificationCompat.BigTextStyle
     get() = NotificationCompat.BigTextStyle(this)
 
@@ -54,7 +57,7 @@ class FrostNotificationTarget(val context: Context,
 
     override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>) {
         builder.setLargeIcon(resource)
-        NotificationManagerCompat.from(context).notify(notifTag, notifId, builder.withBigText.build())
+        NotificationManagerCompat.from(context).notify(notifTag, notifId, builder.withBigText.build().frostConfig())
     }
 }
 
@@ -78,7 +81,7 @@ data class NotificationContent(val data: CookieModel,
         } else {
             val intent = Intent(context, FrostWebActivity::class.java)
             intent.data = Uri.parse("${FB_URL_BASE}$href")
-            intent.putExtra(WebOverlayActivity.ARG_USER_ID, data.id)
+            intent.putExtra(ARG_USER_ID, data.id)
             val group = "frost_${data.id}"
             val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
             val notifBuilder = context.frostNotification
@@ -91,7 +94,7 @@ data class NotificationContent(val data: CookieModel,
 
             if (timestamp != -1L) notifBuilder.setWhen(timestamp * 1000)
             L.v("Notif load $this")
-            NotificationManagerCompat.from(context).notify(group, notifId, notifBuilder.withBigText.build())
+            NotificationManagerCompat.from(context).notify(group, notifId, notifBuilder.withBigText.build().frostConfig())
 
             if (profileUrl.isNotBlank()) {
                 context.runOnUiThread {