diff options
author | Allan Wang <me@allanwang.ca> | 2017-06-19 20:25:58 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-06-19 20:25:58 -0700 |
commit | ab61f2afd887d772426bda9d9aea829557e2e39d (patch) | |
tree | f715f9441679126bf1ace3603a7a1538ed43e092 /app/src/main/kotlin/com/pitchedapps/frost/services | |
parent | a3b5b647e2651c9768a4056852aff36074590e94 (diff) | |
download | frost-ab61f2afd887d772426bda9d9aea829557e2e39d.tar.gz frost-ab61f2afd887d772426bda9d9aea829557e2e39d.tar.bz2 frost-ab61f2afd887d772426bda9d9aea829557e2e39d.zip |
Update kau and show changelog on version change
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/services')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt | 17 |
1 files changed, 5 insertions, 12 deletions
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 cd66b9c2..3f3805a9 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt @@ -6,20 +6,17 @@ import android.app.job.JobParameters import android.app.job.JobService import android.content.Context import android.content.Intent -import android.os.Looper -import android.support.v4.app.ActivityOptionsCompat +import android.net.Uri import android.support.v4.app.NotificationCompat import android.support.v4.app.NotificationManagerCompat -import ca.allanwang.kau.utils.checkThread 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 import com.pitchedapps.frost.facebook.FbTab -import com.pitchedapps.frost.utils.ARG_URL import com.pitchedapps.frost.utils.L import org.jetbrains.anko.doAsync import org.jsoup.Jsoup @@ -105,13 +102,10 @@ class NotificationService : JobService() { data class NotificationContent(val data: CookieModel, val notifId: Int, val href: String, val text: String, val timestamp: Long) { fun createNotification(context: Context) { - val intent = Intent(context, WebOverlayActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK) - intent.putExtra(ARG_URL, "$FB_URL_BASE$href") - intent.action = System.currentTimeMillis().toString() //dummy action + val intent = Intent(context, FrostWebActivity::class.java) + intent.data = Uri.parse("$FB_URL_BASE$href") val group = "frost_${data.id}" - val bundle = ActivityOptionsCompat.makeCustomAnimation(context, R.anim.slide_in_right, R.anim.slide_out_right).toBundle() - val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT, bundle) + val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0) val notifBuilder = NotificationCompat.Builder(context) .setSmallIcon(R.drawable.frost_f_24) .setContentTitle(context.string(R.string.app_name)) @@ -121,7 +115,6 @@ class NotificationService : JobService() { .setSubText(data.name) .setGroup(group) .setAutoCancel(true) -// .setColor(context.color(R.color.facebook_blue)) if (timestamp != -1L) notifBuilder.setWhen(timestamp * 1000) |