diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index 514f1b53..ff319479 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -20,7 +20,9 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> - + @@ -63,12 +65,14 @@ - + + diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index a1f4ad22..57069ff2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -3,6 +3,7 @@ package com.moez.QKSMS.ui.conversations import android.Manifest import android.arch.lifecycle.Observer import android.arch.lifecycle.ViewModelProviders +import android.content.Intent import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import com.karumi.dexter.Dexter @@ -12,6 +13,7 @@ import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkActivity +import com.moez.QKSMS.ui.messages.MessageListActivity import kotlinx.android.synthetic.main.conversation_list_activity.* import timber.log.Timber @@ -22,6 +24,7 @@ class ConversationListActivity : QkActivity(), Observer threadId != -1L }.let { threadId -> + startActivity(Intent(this, MessageListActivity::class.java).putExtra("threadId", threadId)) + } + } + override fun onChanged(state: ConversationListViewState?) { state?.let { if (conversationList.adapter == null && state.conversations?.isValid == true) { diff --git a/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt index 87df986b..d7ad6b22 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt @@ -12,6 +12,7 @@ import android.support.v4.app.NotificationManagerCompat import com.moez.QKSMS.R import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.receiver.MarkSeenReceiver +import com.moez.QKSMS.ui.conversations.ConversationListActivity class NotificationManager(private val context: Context, private val themeManager: ThemeManager) { @@ -53,12 +54,18 @@ class NotificationManager(private val context: Context, private val themeManager style.addMessage(message.body, message.date, name) } + val contentIntent = Intent(context, ConversationListActivity::class.java).putExtra("threadId", threadId) + val contentPI = PendingIntent.getActivity(context, threadId.toInt() + 10000, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId) - val seenPI = PendingIntent.getBroadcast(context, threadId.toInt(), seenIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val seenPI = PendingIntent.getBroadcast(context, threadId.toInt() + 20000, seenIntent, PendingIntent.FLAG_UPDATE_CURRENT) val notification = NotificationCompat.Builder(context, "channel_1") .setColor(themeManager.color) .setSmallIcon(R.mipmap.ic_launcher) + .setNumber(messages.size) + .setAutoCancel(true) + .setContentIntent(contentPI) .setDeleteIntent(seenPI) .setStyle(style)