From 7d254827dd051b8059208a1a0ed81ce86feb1c2b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 27 Dec 2017 21:14:59 -0500 Subject: [PATCH] Use TaskStackBuilder to launch ComposeActivity from notification --- qksms/src/main/AndroidManifest.xml | 4 +++- .../moez/QKSMS/common/util/NotificationManager.kt | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index 3b5fa5e9..458bb925 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -44,7 +44,9 @@ - + diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index b20ba6dd..2c2d60a1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -29,10 +29,11 @@ import android.os.Build import android.support.v4.app.NotificationCompat import android.support.v4.app.NotificationManagerCompat import android.support.v4.app.RemoteInput +import android.support.v4.app.TaskStackBuilder import com.moez.QKSMS.R import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.MarkUnarchived -import com.moez.QKSMS.presentation.main.MainActivity +import com.moez.QKSMS.presentation.compose.ComposeActivity import com.moez.QKSMS.receiver.MarkReadReceiver import com.moez.QKSMS.receiver.MarkSeenReceiver import com.moez.QKSMS.receiver.RemoteMessagingReceiver @@ -94,8 +95,11 @@ class NotificationManager @Inject constructor( style.addMessage(message.body, message.date, name) } - val contentIntent = Intent(context, MainActivity::class.java).putExtra("threadId", threadId) - val contentPI = PendingIntent.getActivity(context, threadId.toInt() + 10000, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId) + val taskStackBuilder = TaskStackBuilder.create(context) + taskStackBuilder.addParentStack(ComposeActivity::class.java) + taskStackBuilder.addNextIntent(contentIntent) + val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt() + 10000, PendingIntent.FLAG_UPDATE_CURRENT) val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId) val seenPI = PendingIntent.getBroadcast(context, threadId.toInt() + 20000, seenIntent, PendingIntent.FLAG_UPDATE_CURRENT) @@ -104,7 +108,7 @@ class NotificationManager @Inject constructor( val readPI = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, readIntent, PendingIntent.FLAG_UPDATE_CURRENT) val readAction = NotificationCompat.Action(R.drawable.ic_done_black_24dp, context.getString(R.string.notification_read), readPI) - val notification = NotificationCompat.Builder(context, "channel_1") + val notification = NotificationCompat.Builder(context, DEFAULT_CHANNEL_ID) .setColor(colors.theme.blockingFirst()) .setSmallIcon(R.mipmap.ic_launcher) .setNumber(messages.size)