wbrawner/AquaDroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clickable notification in Android O and later,

Browse source 
Fix redundant notification on app launching
This commit is contained in:
z3r0c00l-2k 2019-06-07 20:25:31 +05:30
parent 8b8eaed778
commit dd44cfcf74
2 changed files with 23 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/github/z3r0c00l_2k/aquadroid/MainActivity.kt
View file

@ -59,14 +59,6 @@ class MainActivity : AppCompatActivity() {
notificStatus = sharedPref.getBoolean(AppUtils.NOTIFICATION_STATUS_KEY, true)
val alarm = AlarmHelper()
alarm.cancelAlarm(this)
if (notificStatus) {
btnNotific.setImageDrawable(getDrawable(R.drawable.ic_bell))
alarm.setAlarm(this, sharedPref.getInt(AppUtils.NOTIFICATION_FREQUENCY_KEY, 30).toLong())
} else {
btnNotific.setImageDrawable(getDrawable(R.drawable.ic_bell_disabled))
}
sqliteHelper.addAll(dateNow, 0, totalIntake)

63
app/src/main/java/io/github/z3r0c00l_2k/aquadroid/helpers/NotificationHelper.kt
View file

@ -13,6 +13,7 @@ import android.media.RingtoneManager
import android.net.Uri
import android.os.Build
import android.util.Log
import androidx.core.app.NotificationCompat
import io.github.z3r0c00l_2k.aquadroid.MainActivity
import io.github.z3r0c00l_2k.aquadroid.R
import io.github.z3r0c00l_2k.aquadroid.utils.AppUtils
@ -58,51 +59,33 @@ class NotificationHelper(val ctx: Context) {
title: String,
body: String,
notificationsTone: String?
): Notification.Builder {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
createChannels()
return Notification.Builder(ctx.applicationContext, CHANNEL_ONE_ID)
.setContentTitle(title)
.setContentText(body)
.setColorized(true)
.setColor(Color.BLUE)
.setShowWhen(true)
.setLargeIcon(
BitmapFactory.decodeResource(
ctx.resources,
R.mipmap.ic_launcher
)
): NotificationCompat.Builder? {
createChannels()
val notification = NotificationCompat.Builder(ctx.applicationContext, CHANNEL_ONE_ID)
.setContentTitle(title)
.setContentText(body)
.setLargeIcon(
BitmapFactory.decodeResource(
ctx.resources,
R.mipmap.ic_launcher
)
.setSmallIcon(R.drawable.ic_small_logo)
.setAutoCancel(true)
} else {
)
.setSmallIcon(R.drawable.ic_small_logo)
.setAutoCancel(true)
val notification = Notification.Builder(ctx.applicationContext)
.setContentTitle(title)
.setContentText(body)
.setLargeIcon(
BitmapFactory.decodeResource(
ctx.resources,
R.mipmap.ic_launcher
)
)
.setSmallIcon(R.drawable.ic_small_logo)
.setAutoCancel(true)
notification.setShowWhen(true)
notification.setShowWhen(true)
notification.setSound(Uri.parse(notificationsTone))
notification.setSound(Uri.parse(notificationsTone))
val notificationIntent = Intent(ctx, MainActivity::class.java)
val notificationIntent = Intent(ctx, MainActivity::class.java)
notificationIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
val contentIntent =
PendingIntent.getActivity(ctx, 99, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
notificationIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
val contentIntent =
PendingIntent.getActivity(ctx, 99, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
notification.setContentIntent(contentIntent)
notification.setContentIntent(contentIntent)
return notification
}
return notification
}
private fun shallNotify(): Boolean {
@ -144,9 +127,9 @@ class NotificationHelper(val ctx: Context) {
return currentCal.timeInMillis - runCal.timeInMillis
}
fun notify(id: Long, notification: Notification.Builder) {
fun notify(id: Long, notification: NotificationCompat.Builder?) {
if (shallNotify()) {
getManager()!!.notify(id.toInt(), notification.build())
getManager()!!.notify(id.toInt(), notification!!.build())
} else {
Log.i("AquaDroid", "dnd period")
}