forked from upstream-mirrors/quik
Open conversation when notification clicked
This commit is contained in:
@@ -20,7 +20,9 @@
|
|||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/AppTheme">
|
android:theme="@style/AppTheme">
|
||||||
|
|
||||||
<activity android:name=".ui.conversations.ConversationListActivity">
|
<activity
|
||||||
|
android:name=".ui.conversations.ConversationListActivity"
|
||||||
|
android:launchMode="singleTask">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
@@ -63,12 +65,14 @@
|
|||||||
<receiver android:name=".receiver.MessageDeliveredReceiver" />
|
<receiver android:name=".receiver.MessageDeliveredReceiver" />
|
||||||
<receiver android:name=".receiver.MarkSeenReceiver" />
|
<receiver android:name=".receiver.MarkSeenReceiver" />
|
||||||
|
|
||||||
<service android:name=".service.HeadlessSmsSendService"
|
<service
|
||||||
android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
|
android:name=".service.HeadlessSmsSendService"
|
||||||
android:exported="true" >
|
android:exported="true"
|
||||||
|
android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
|
<action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
|
||||||
<data android:scheme="sms" />
|
<data android:scheme="sms" />
|
||||||
<data android:scheme="smsto" />
|
<data android:scheme="smsto" />
|
||||||
<data android:scheme="mms" />
|
<data android:scheme="mms" />
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.moez.QKSMS.ui.conversations
|
|||||||
import android.Manifest
|
import android.Manifest
|
||||||
import android.arch.lifecycle.Observer
|
import android.arch.lifecycle.Observer
|
||||||
import android.arch.lifecycle.ViewModelProviders
|
import android.arch.lifecycle.ViewModelProviders
|
||||||
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
import com.karumi.dexter.Dexter
|
import com.karumi.dexter.Dexter
|
||||||
@@ -12,6 +13,7 @@ import com.karumi.dexter.listener.PermissionRequest
|
|||||||
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
|
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.ui.base.QkActivity
|
import com.moez.QKSMS.ui.base.QkActivity
|
||||||
|
import com.moez.QKSMS.ui.messages.MessageListActivity
|
||||||
import kotlinx.android.synthetic.main.conversation_list_activity.*
|
import kotlinx.android.synthetic.main.conversation_list_activity.*
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
|
|
||||||
@@ -22,6 +24,7 @@ class ConversationListActivity : QkActivity(), Observer<ConversationListViewStat
|
|||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.conversation_list_activity)
|
setContentView(R.layout.conversation_list_activity)
|
||||||
|
onNewIntent(intent)
|
||||||
requestPermissions()
|
requestPermissions()
|
||||||
|
|
||||||
viewModel = ViewModelProviders.of(this)[ConversationListViewModel::class.java]
|
viewModel = ViewModelProviders.of(this)[ConversationListViewModel::class.java]
|
||||||
@@ -32,6 +35,13 @@ class ConversationListActivity : QkActivity(), Observer<ConversationListViewStat
|
|||||||
swipeRefresh.setOnRefreshListener { viewModel.onRefresh() }
|
swipeRefresh.setOnRefreshListener { viewModel.onRefresh() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onNewIntent(intent: Intent?) {
|
||||||
|
super.onNewIntent(intent)
|
||||||
|
intent?.getLongExtra("threadId", -1)?.takeIf { threadId -> threadId != -1L }.let { threadId ->
|
||||||
|
startActivity(Intent(this, MessageListActivity::class.java).putExtra("threadId", threadId))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun onChanged(state: ConversationListViewState?) {
|
override fun onChanged(state: ConversationListViewState?) {
|
||||||
state?.let {
|
state?.let {
|
||||||
if (conversationList.adapter == null && state.conversations?.isValid == true) {
|
if (conversationList.adapter == null && state.conversations?.isValid == true) {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import android.support.v4.app.NotificationManagerCompat
|
|||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import com.moez.QKSMS.receiver.MarkSeenReceiver
|
import com.moez.QKSMS.receiver.MarkSeenReceiver
|
||||||
|
import com.moez.QKSMS.ui.conversations.ConversationListActivity
|
||||||
|
|
||||||
|
|
||||||
class NotificationManager(private val context: Context, private val themeManager: ThemeManager) {
|
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)
|
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 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")
|
val notification = NotificationCompat.Builder(context, "channel_1")
|
||||||
.setColor(themeManager.color)
|
.setColor(themeManager.color)
|
||||||
.setSmallIcon(R.mipmap.ic_launcher)
|
.setSmallIcon(R.mipmap.ic_launcher)
|
||||||
|
.setNumber(messages.size)
|
||||||
|
.setAutoCancel(true)
|
||||||
|
.setContentIntent(contentPI)
|
||||||
.setDeleteIntent(seenPI)
|
.setDeleteIntent(seenPI)
|
||||||
.setStyle(style)
|
.setStyle(style)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user