jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- replaced message notification option "Archive" with "Save"

Browse Source
This commit is contained in:
Juha Heinanen
2018-11-18 13:44:15 +02:00
parent 49d9d8c311
commit a5e22786c4
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+8 -8
View File
@@ -343,14 +343,14 @@ class BaresipService: Service() {
replyIntent.putExtra("peer", peer) replyIntent.putExtra("peer", peer)
val replyPendingIntent = PendingIntent.getActivity(this, val replyPendingIntent = PendingIntent.getActivity(this,
0, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT) 0, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val archiveIntent = Intent(this, MainActivity::class.java) val saveIntent = Intent(this, MainActivity::class.java)
archiveIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or saveIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or
Intent.FLAG_ACTIVITY_SINGLE_TOP) Intent.FLAG_ACTIVITY_SINGLE_TOP)
archiveIntent.putExtra("action", "archive") saveIntent.putExtra("action", "save")
archiveIntent.putExtra("uap", uap) saveIntent.putExtra("uap", uap)
archiveIntent.putExtra("time", timeStamp) saveIntent.putExtra("time", timeStamp)
val archivePendingIntent = PendingIntent.getActivity(this, val savePendingIntent = PendingIntent.getActivity(this,
1, archiveIntent, PendingIntent.FLAG_UPDATE_CURRENT) 1, saveIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val deleteIntent = Intent(this, MainActivity::class.java) val deleteIntent = Intent(this, MainActivity::class.java)
deleteIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or deleteIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or
Intent.FLAG_ACTIVITY_SINGLE_TOP) Intent.FLAG_ACTIVITY_SINGLE_TOP)
@@ -363,7 +363,7 @@ class BaresipService: Service() {
view.setOnClickPendingIntent(R.id.rejectButton, rejectPendingIntent) view.setOnClickPendingIntent(R.id.rejectButton, rejectPendingIntent)
cnb.setCustomBigContentView(view) */ cnb.setCustomBigContentView(view) */
cnb.addAction(R.drawable.ic_stat, "Reply", replyPendingIntent) cnb.addAction(R.drawable.ic_stat, "Reply", replyPendingIntent)
cnb.addAction(R.drawable.ic_stat, "Archive", archivePendingIntent) cnb.addAction(R.drawable.ic_stat, "Save", savePendingIntent)
cnb.addAction(R.drawable.ic_stat, "Delete", deletePendingIntent) cnb.addAction(R.drawable.ic_stat, "Delete", deletePendingIntent)
nm.notify(MESSAGE_NOTIFICATION_ID, cnb.build()) nm.notify(MESSAGE_NOTIFICATION_ID, cnb.build())
} }
app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
+1 -1
View File
@@ -180,7 +180,7 @@ class ChatsActivity: AppCompatActivity() {
companion object { companion object {
fun archiveUaMessage(aor: String, time: Long) { fun saveUaMessage(aor: String, time: Long) {
for (i in MainActivity.messages.indices.reversed()) for (i in MainActivity.messages.indices.reversed())
if ((MainActivity.messages[i].aor == aor) && if ((MainActivity.messages[i].aor == aor) &&
(MainActivity.messages[i].timeStamp == time)) { (MainActivity.messages[i].timeStamp == time)) {
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+3 -3
View File
@@ -729,7 +729,7 @@ class MainActivity : AppCompatActivity() {
rejectCall = intent.getStringExtra("callp") rejectCall = intent.getStringExtra("callp")
moveTaskToBack(true) moveTaskToBack(true)
} }
"reply", "archive", "delete" -> { "reply", "save", "delete" -> {
val uap = intent.getStringExtra("uap") val uap = intent.getStringExtra("uap")
val ua = UserAgent.find(MainActivity.uas, uap) val ua = UserAgent.find(MainActivity.uas, uap)
if (ua == null) { if (ua == null) {
@@ -755,8 +755,8 @@ class MainActivity : AppCompatActivity() {
i.putExtras(b) i.putExtras(b)
startActivityForResult(i, MESSAGE_CODE) startActivityForResult(i, MESSAGE_CODE)
} }
"archive" -> { "save" -> {
ChatsActivity.archiveUaMessage(ua.account.aor, ChatsActivity.saveUaMessage(ua.account.aor,
intent.getStringExtra("time").toLong()) intent.getStringExtra("time").toLong())
moveTaskToBack(true) moveTaskToBack(true)
} }