diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index ae78855a..0bb6bc92 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -343,14 +343,14 @@ class BaresipService: Service() { replyIntent.putExtra("peer", peer) val replyPendingIntent = PendingIntent.getActivity(this, 0, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT) - val archiveIntent = Intent(this, MainActivity::class.java) - archiveIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or + val saveIntent = Intent(this, MainActivity::class.java) + saveIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP) - archiveIntent.putExtra("action", "archive") - archiveIntent.putExtra("uap", uap) - archiveIntent.putExtra("time", timeStamp) - val archivePendingIntent = PendingIntent.getActivity(this, - 1, archiveIntent, PendingIntent.FLAG_UPDATE_CURRENT) + saveIntent.putExtra("action", "save") + saveIntent.putExtra("uap", uap) + saveIntent.putExtra("time", timeStamp) + val savePendingIntent = PendingIntent.getActivity(this, + 1, saveIntent, PendingIntent.FLAG_UPDATE_CURRENT) val deleteIntent = Intent(this, MainActivity::class.java) deleteIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP) @@ -363,7 +363,7 @@ class BaresipService: Service() { view.setOnClickPendingIntent(R.id.rejectButton, rejectPendingIntent) cnb.setCustomBigContentView(view) */ 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) nm.notify(MESSAGE_NOTIFICATION_ID, cnb.build()) } diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt index 4b60773d..9c262356 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt @@ -180,7 +180,7 @@ class ChatsActivity: AppCompatActivity() { companion object { - fun archiveUaMessage(aor: String, time: Long) { + fun saveUaMessage(aor: String, time: Long) { for (i in MainActivity.messages.indices.reversed()) if ((MainActivity.messages[i].aor == aor) && (MainActivity.messages[i].timeStamp == time)) { diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index 548c3464..33bf4663 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -729,7 +729,7 @@ class MainActivity : AppCompatActivity() { rejectCall = intent.getStringExtra("callp") moveTaskToBack(true) } - "reply", "archive", "delete" -> { + "reply", "save", "delete" -> { val uap = intent.getStringExtra("uap") val ua = UserAgent.find(MainActivity.uas, uap) if (ua == null) { @@ -755,8 +755,8 @@ class MainActivity : AppCompatActivity() { i.putExtras(b) startActivityForResult(i, MESSAGE_CODE) } - "archive" -> { - ChatsActivity.archiveUaMessage(ua.account.aor, + "save" -> { + ChatsActivity.saveUaMessage(ua.account.aor, intent.getStringExtra("time").toLong()) moveTaskToBack(true) }