aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/services
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-20 15:50:08 -0700
committerAllan Wang <me@allanwang.ca>2017-06-20 15:50:08 -0700
commite916afddb89550d7f99f17e1477ad17f3bd770f9 (patch)
treeb9a846da082599295d2671d29eaee74d9310f4c6 /app/src/main/kotlin/com/pitchedapps/frost/services
parent2d7fa0f6d0c152bb9f3fd30370ef510a0d452d00 (diff)
downloadfrost-e916afddb89550d7f99f17e1477ad17f3bd770f9.tar.gz
frost-e916afddb89550d7f99f17e1477ad17f3bd770f9.tar.bz2
frost-e916afddb89550d7f99f17e1477ad17f3bd770f9.zip
Add user switching for notifications
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/services')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/NotificationExtensions.kt13
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt2
2 files changed, 2 insertions, 13 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationExtensions.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationExtensions.kt
deleted file mode 100644
index ac94b527..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationExtensions.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.pitchedapps.frost.services
-
-import android.content.Context
-import android.content.Intent
-
-/**
- * Created by Allan Wang on 2017-06-14.
- */
-fun Context.requestNotifications(id: Long) {
- val intent = Intent(this, NotificationService::class.java)
- intent.putExtra(NotificationService.ARG_ID, id)
- startService(intent)
-} \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
index 813bdce2..9c8bf2e6 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
@@ -12,6 +12,7 @@ import ca.allanwang.kau.utils.string
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.*
import com.pitchedapps.frost.facebook.FACEBOOK_COM
import com.pitchedapps.frost.facebook.FB_URL_BASE
@@ -109,6 +110,7 @@ class NotificationService : JobService() {
} else {
val intent = Intent(context, FrostWebActivity::class.java)
intent.data = Uri.parse("$FB_URL_BASE$href")
+ intent.putExtra(WebOverlayActivity.ARG_USER_ID, data.id)
val group = "frost_${data.id}"
val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
val notifBuilder = context.frostNotification