Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

プッシュ通知のサマリ通知を出す

This commit is contained in:
tateisu 2023-02-11 20:34:31 +09:00
parent e897265c63
commit 963dc4edec
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt
View File

@ -773,6 +773,8 @@ class PushRepo(
PendingIntent.FLAG_IMMUTABLE
)
val group = context.packageName + ":" + account.acct.ascii
val urlDeleteSummary = "${ncPushMessage.uriPrefixDelete}/summary/${account.acct.ascii}"
val urlDelete = "${ncPushMessage.uriPrefixDelete}/${pm.id}"
val iDelete = context.intentNotificationDelete(urlDelete.toUri())
val piDelete = PendingIntent.getBroadcast(
@ -790,7 +792,6 @@ class PushRepo(
?.let { ContextCompat.getColor(context, it) }
?: account.notificationAccentColor.notZero()
?: ContextCompat.getColor(context, R.color.colorOsNotificationAccent)
setSmallIcon(iconSmall)
iconBitmapLarge?.let { setLargeIcon(it) }
setContentTitle(pm.loginAcct?.pretty)
@ -802,8 +803,20 @@ class PushRepo(
pm.textExpand.notEmpty()?.let {
setStyle(NotificationCompat.BigTextStyle().bigText(it))
}
setGroup(group)
}
setGroup(context.packageName + ":" + account.acct.ascii)
ncPushMessage.notify(context, urlDeleteSummary) {
setContentTitle(account.acct.pretty)
setContentText("notifications")
setWhen(pm.timestamp)
setSmallIcon(R.drawable.ic_notification)
color = account.notificationAccentColor.notZero()
?: ContextCompat.getColor(context, R.color.colorOsNotificationAccent)
setContentIntent(piTap)
setAutoCancel(true)
setGroup(group)
setGroupSummary(true)
}
}

17
app/src/main/java/jp/juggler/subwaytooter/table/SavedAccount.kt
View File

@ -38,7 +38,7 @@ class SavedAccount(
apiHostArg: String? = null,
apDomainArg: String? = null,
var accountJson:JsonObject? = null,
var accountJson: JsonObject? = null,
var confirmBoost: Boolean = false,
var confirmFavourite: Boolean = false,
var confirmFollow: Boolean = false,
@ -471,7 +471,7 @@ class SavedAccount(
if (isInvalidId) error("saveSetting: missing db_id")
ContentValues().apply {
put(COL_ACCOUNT,accountJson?.toString())
put(COL_ACCOUNT, accountJson?.toString())
put(COL_CONFIRM_BOOST, confirmBoost)
put(COL_CONFIRM_FAVOURITE, confirmFavourite)
put(COL_CONFIRM_FOLLOW, confirmFollow)
@ -503,9 +503,9 @@ class SavedAccount(
put(COL_NOTIFICATION_VOTE, notificationVote)
put(COL_PUSH_POLICY, pushPolicy)
// put(COL_SOUND_URI, soundUri)
put(COL_TOKEN,tokenJson?.toString())
put(COL_TOKEN, tokenJson?.toString())
put(COL_VISIBILITY, visibility.id.toString())
put(COL_MISSKEY_VERSION,misskeyVersion)
put(COL_MISSKEY_VERSION, misskeyVersion)
}.let { db.update(table, it, "$COL_ID=?", arrayOf(db_id.toString())) }
}
}
@ -612,11 +612,12 @@ class SavedAccount(
fun loadRealAccounts() =
ArrayList<SavedAccount>().also { result ->
try {
db.rawQuery("select * from $table where $COL_USER not like '?%'", emptyArray()).use { cursor ->
while (cursor.moveToNext()) {
parse(lazyContext, cursor)?.let { result.add(it) }
db.rawQuery("select * from $table where $COL_USER not like '?%'", emptyArray())
.use { cursor ->
while (cursor.moveToNext()) {
parse(lazyContext, cursor)?.let { result.add(it) }
}
}
}
} catch (ex: Throwable) {
log.e(ex, "loadAccountList failed.")
lazyContext.showToast(