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

status bar improvements: with click to baresip, show reg status

Browse Source
This commit is contained in:
Juha Heinanen
2018-05-12 19:12:46 +03:00
parent d60e035641
commit 8a3c91f898
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+41 -6
View File
@@ -4,6 +4,7 @@ import android.Manifest
import android.app.Notification import android.app.Notification
import android.app.Notification.VISIBILITY_PUBLIC import android.app.Notification.VISIBILITY_PUBLIC
import android.app.NotificationManager import android.app.NotificationManager
import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
@@ -262,8 +263,8 @@ class MainActivity : AppCompatActivity() {
if (!running) { if (!running) {
Log.i("Baresip", "Starting Baresip with path $path") Log.i("Baresip", "Starting Baresip with path $path")
statusBarIcon(NOTIFICATION_ID, "")
Thread(Runnable { baresipStart(path) }).start() Thread(Runnable { baresipStart(path) }).start()
addStatusBarIcon(10)
running = true running = true
} }
} }
@@ -570,16 +571,40 @@ class MainActivity : AppCompatActivity() {
layout.addView(reject_button) layout.addView(reject_button)
} }
private fun addStatusBarIcon(id: Int) { private fun statusBarIcon(id: Int, status: String) {
val ni = Intent(this, MainActivity::class.java)
.setAction(Intent.ACTION_MAIN)
.addCategory(Intent.CATEGORY_LAUNCHER)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
val pi = PendingIntent.getActivity(this, id, ni, PendingIntent.FLAG_UPDATE_CURRENT)
nm = getSystemService(NOTIFICATION_SERVICE) as NotificationManager nm = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
val notification = Notification.Builder(this) val notification = Notification.Builder(this)
.setSmallIcon(R.drawable.ic_stat) .setSmallIcon(R.drawable.ic_stat)
.setContentTitle("Baresip is running") .setContentTitle("Baresip is running${status}!")
.setVisibility(VISIBILITY_PUBLIC) .setVisibility(VISIBILITY_PUBLIC)
.setContentIntent(pi)
.setOngoing(true).build() .setOngoing(true).build()
nm.notify(id, notification) nm.notify(id, notification)
} }
private fun updateNotification() {
var status: String = ""
for (image in images) {
when (image) {
R.drawable.dot_red -> {
status = status + " X"
}
R.drawable.dot_yellow -> {
status = status + " ?"
}
R.drawable.dot_green -> {
status = status + " OK"
}
}
}
statusBarIcon(NOTIFICATION_ID, status)
}
@Keep @Keep
fun addAccount(ua: String) { fun addAccount(ua: String) {
val aor = ua_aor(ua) val aor = ua_aor(ua)
@@ -587,7 +612,10 @@ class MainActivity : AppCompatActivity() {
accounts.add(Account(ua, aor, ua_mediaenc(ua),"")) accounts.add(Account(ua, aor, ua_mediaenc(ua),""))
aors.add(aor) aors.add(aor)
images.add(R.drawable.dot_yellow) images.add(R.drawable.dot_yellow)
this@MainActivity.runOnUiThread { accountAdapter.notifyDataSetChanged() } this@MainActivity.runOnUiThread {
accountAdapter.notifyDataSetChanged()
updateNotification()
}
} }
@Keep @Keep
@@ -610,14 +638,20 @@ class MainActivity : AppCompatActivity() {
accounts[account_index].status = "OK" accounts[account_index].status = "OK"
aors[account_index] = aor aors[account_index] = aor
images[account_index] = R.drawable.dot_green images[account_index] = R.drawable.dot_green
this@MainActivity.runOnUiThread { accountAdapter.notifyDataSetChanged() } this@MainActivity.runOnUiThread {
accountAdapter.notifyDataSetChanged()
updateNotification()
}
} }
"registering failed" -> { "registering failed" -> {
Log.d("Baresip", "Setting status to red") Log.d("Baresip", "Setting status to red")
accounts[account_index].status = "FAIL" accounts[account_index].status = "FAIL"
aors[account_index] = aor aors[account_index] = aor
images[account_index] = R.drawable.dot_red images[account_index] = R.drawable.dot_red
this@MainActivity.runOnUiThread { accountAdapter.notifyDataSetChanged() } this@MainActivity.runOnUiThread {
accountAdapter.notifyDataSetChanged()
updateNotification()
}
} }
"call ringing" -> { "call ringing" -> {
} }
@@ -896,6 +930,7 @@ class MainActivity : AppCompatActivity() {
const val ABOUT_CODE = 5 const val ABOUT_CODE = 5
const val HISTORY_SIZE = 100 const val HISTORY_SIZE = 100
const val NOTIFICATION_ID = 10
external fun contacts_remove() external fun contacts_remove()
external fun contact_add(contact: String) external fun contact_add(contact: String)