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

Dialog cleanup.

Browse Source
This commit is contained in:
Juha Heinanen
2020-07-02 11:07:32 +03:00
parent 27429d9eba
commit 4172df8953
2 changed files with 151 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+151 -136
View File
@@ -201,29 +201,29 @@ class MainActivity : AppCompatActivity() {
getString(R.string.peer_not_verified)) getString(R.string.peer_not_verified))
} }
"green" -> { "green" -> {
val inflater = this.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
val titleView = inflater.inflate(R.layout.alert_title, null) as TextView
titleView.text = getString(R.string.info) titleView.text = getString(R.string.info)
val builder = AlertDialog.Builder(this) with (AlertDialog.Builder(this)) {
builder.setCustomTitle(titleView) setCustomTitle(titleView)
builder.setMessage(getString(R.string.call_is_secure)) setMessage(getString(R.string.call_is_secure))
builder.setPositiveButton(getString(R.string.unverify)) { dialog, _ -> setPositiveButton(getString(R.string.unverify)) { dialog, _ ->
val calls = Call.uaCalls(UserAgent.uas()[aorSpinner.selectedItemPosition], "") val calls = Call.uaCalls(UserAgent.uas()[aorSpinner.selectedItemPosition], "")
if (calls.size > 0) { if (calls.size > 0) {
if (Api.cmd_exec("zrtp_unverify " + calls[0].zid) != 0) { if (Api.cmd_exec("zrtp_unverify " + calls[0].zid) != 0) {
Log.e("Baresip", Log.e("Baresip",
"Command 'zrtp_unverify ${calls[0].zid}' failed") "Command 'zrtp_unverify ${calls[0].zid}' failed")
} else { } else {
securityButton.setImageResource(R.drawable.box_yellow) securityButton.setImageResource(R.drawable.box_yellow)
securityButton.tag = "yellow" securityButton.tag = "yellow"
}
} }
dialog.dismiss()
} }
dialog.dismiss() setNegativeButton(getString(R.string.no)) { dialog, _ ->
dialog.dismiss()
}
show()
} }
builder.setNegativeButton(getString(R.string.no)) { dialog, _ ->
dialog.dismiss()
}
builder.create().show()
} }
} }
} }
@@ -373,13 +373,15 @@ class MainActivity : AppCompatActivity() {
} }
} }
} }
val builder = AlertDialog.Builder(this@MainActivity, val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
R.style.Theme_AppCompat) titleView.text = getString(R.string.voicemail_messages)
builder.setTitle(getString(R.string.voicemail_messages)) with (AlertDialog.Builder(this)) {
builder.setMessage(acc.vmMessages(this)) setCustomTitle(titleView)
.setPositiveButton(getString(R.string.listen), dialogClickListener) setMessage(acc.vmMessages(this@MainActivity))
.setNegativeButton(getString(R.string.cancel), dialogClickListener) setPositiveButton(getString(R.string.listen), dialogClickListener)
.show() setNegativeButton(getString(R.string.cancel), dialogClickListener)
show()
}
} }
} }
} }
@@ -592,16 +594,16 @@ class MainActivity : AppCompatActivity() {
if (event == "stopped") { if (event == "stopped") {
Log.d("Baresip", "Handling service event 'stopped' with param '${params[0]}'") Log.d("Baresip", "Handling service event 'stopped' with param '${params[0]}'")
if (params[0] != "") { if (params[0] != "") {
val inflater = this.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
val titleView = inflater.inflate(R.layout.alert_title, null) as TextView
titleView.text = getString(R.string.notice) titleView.text = getString(R.string.notice)
val builder = AlertDialog.Builder(this) with (AlertDialog.Builder(this)) {
builder.setCustomTitle(titleView) setCustomTitle(titleView)
builder.setMessage(getString(R.string.start_failed)) setMessage(getString(R.string.start_failed))
builder.setNeutralButton(getString(R.string.ok)) { dialog, _ -> setNeutralButton(getString(R.string.ok)) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
}
show()
} }
builder.create().show()
} else { } else {
quitTimer.cancel() quitTimer.cancel()
finishAndRemoveTask() finishAndRemoveTask()
@@ -685,41 +687,41 @@ class MainActivity : AppCompatActivity() {
Log.w("Baresip", "Call $callp to be verified is not found") Log.w("Baresip", "Call $callp to be verified is not found")
return return
} }
val inflater = this.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
val titleView = inflater.inflate(R.layout.alert_title, null) as TextView
titleView.text = getString(R.string.verify) titleView.text = getString(R.string.verify)
val builder = AlertDialog.Builder(this) with (AlertDialog.Builder(this)) {
builder.setCustomTitle(titleView) setCustomTitle(titleView)
builder.setMessage(String.format(getString(R.string.verify_sas), setMessage(String.format(getString(R.string.verify_sas),
ev[1], ev[2])) ev[1], ev[2]))
builder.setPositiveButton(getString(R.string.yes)) { dialog, _ -> setPositiveButton(getString(R.string.yes)) { dialog, _ ->
val security: Int val security: Int
if (Api.cmd_exec("zrtp_verify ${ev[3]}") != 0) { if (Api.cmd_exec("zrtp_verify ${ev[3]}") != 0) {
Log.e("Baresip", "Command 'zrtp_verify ${ev[3]}' failed") Log.e("Baresip", "Command 'zrtp_verify ${ev[3]}' failed")
security = R.drawable.box_yellow security = R.drawable.box_yellow
} else { } else {
security = R.drawable.box_green security = R.drawable.box_green
}
call.security = security
call.zid = ev[3]
if (aor == aorSpinner.tag) {
securityButton.setImageResource(security)
setSecurityButtonTag(securityButton, security)
securityButton.visibility = View.VISIBLE
dialog.dismiss()
}
} }
call.security = security setNegativeButton(getString(R.string.no)) { dialog, _ ->
call.zid = ev[3] call.security = R.drawable.box_yellow
if (aor == aorSpinner.tag) { call.zid = ev[3]
securityButton.setImageResource(security) if (aor == aorSpinner.tag) {
setSecurityButtonTag(securityButton, security) securityButton.setImageResource(R.drawable.box_yellow)
securityButton.visibility = View.VISIBLE securityButton.tag = "yellow"
securityButton.visibility = View.VISIBLE
}
dialog.dismiss() dialog.dismiss()
} }
show()
} }
builder.setNegativeButton(getString(R.string.no)) { dialog, _ ->
call.security = R.drawable.box_yellow
call.zid = ev[3]
if (aor == aorSpinner.tag) {
securityButton.setImageResource(R.drawable.box_yellow)
securityButton.tag = "yellow"
securityButton.visibility = View.VISIBLE
}
dialog.dismiss()
}
if (!isFinishing()) builder.create().show()
} }
"call verified", "call secure" -> { "call verified", "call secure" -> {
val callp = params[1] val callp = params[1]
@@ -745,24 +747,28 @@ class MainActivity : AppCompatActivity() {
Log.w("Baresip", "Call $callp to be transferred is not found") Log.w("Baresip", "Call $callp to be transferred is not found")
return return
} }
val transferDialog = AlertDialog.Builder(this) val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
titleView.text = getString(R.string.transfer)
val target = Utils.friendlyUri(ContactsActivity.contactName(ev[1]), val target = Utils.friendlyUri(ContactsActivity.contactName(ev[1]),
Utils.aorDomain(aor)) Utils.aorDomain(aor))
transferDialog.setMessage(String.format(getString(R.string.transfer_query), with (AlertDialog.Builder(this)) {
target)) setCustomTitle(titleView)
transferDialog.setPositiveButton(getString(R.string.yes)) { dialog, _ -> setMessage(String.format(getString(R.string.transfer_query),
if (call in Call.calls()) target))
Api.ua_hangup(uap, callp, 0, "") setPositiveButton(getString(R.string.yes)) { dialog, _ ->
call(ua, ev[1], "transferring") if (call in Call.calls())
showCall(ua) Api.ua_hangup(uap, callp, 0, "")
dialog.dismiss() call(ua, ev[1], "transferring")
showCall(ua)
dialog.dismiss()
}
setNegativeButton(getString(R.string.no)) { dialog, _ ->
if (call in Call.calls())
call.notifySipfrag(603, "Decline")
dialog.dismiss()
}
show()
} }
transferDialog.setNegativeButton(getString(R.string.no)) { dialog, _ ->
if (call in Call.calls())
call.notifySipfrag(603, "Decline")
dialog.dismiss()
}
transferDialog.create().show()
} }
"transfer accept" -> { "transfer accept" -> {
val callp = params[1] val callp = params[1]
@@ -946,16 +952,20 @@ class MainActivity : AppCompatActivity() {
CONFIG_CODE -> { CONFIG_CODE -> {
if ((data != null) && data.hasExtra("restart")) { if ((data != null) && data.hasExtra("restart")) {
val restartDialog = AlertDialog.Builder(this) val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
restartDialog.setMessage(getString(R.string.config_restart)) titleView.text = getString(R.string.restart_request)
restartDialog.setPositiveButton(getText(R.string.restart)) { dialog, _ -> with (AlertDialog.Builder(this)) {
dialog.dismiss() setCustomTitle(titleView)
quitRestart(true) setMessage(getString(R.string.config_restart))
setPositiveButton(getText(R.string.restart)) { dialog, _ ->
dialog.dismiss()
quitRestart(true)
}
setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss()
}
show()
} }
restartDialog.setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss()
}
restartDialog.create().show()
} }
} }
@@ -1018,7 +1028,6 @@ class MainActivity : AppCompatActivity() {
} }
private fun askPassword(title: String, ua: UserAgent? = null) { private fun askPassword(title: String, ua: UserAgent? = null) {
val builder = AlertDialog.Builder(this, R.style.AlertDialogTheme)
val layout = LayoutInflater.from(this) val layout = LayoutInflater.from(this)
.inflate(R.layout.password_dialog, findViewById(android.R.id.content) as ViewGroup, .inflate(R.layout.password_dialog, findViewById(android.R.id.content) as ViewGroup,
false) false)
@@ -1037,28 +1046,31 @@ class MainActivity : AppCompatActivity() {
else else
input.transformationMethod = PasswordTransformationMethod() input.transformationMethod = PasswordTransformationMethod()
} }
builder.setView(layout) val context = this
builder.setPositiveButton(android.R.string.ok) { dialog, _ -> with (AlertDialog.Builder(this)) {
dialog.dismiss() setView(layout)
var password = input.text.toString().trim() setPositiveButton(android.R.string.ok) { dialog, _ ->
if (!Account.checkAuthPass(password)) { dialog.dismiss()
Utils.alertView(this, getString(R.string.notice), var password = input.text.toString().trim()
String.format(getString(R.string.invalid_authentication_password), password)) if (!Account.checkAuthPass(password)) {
password = "" Utils.alertView(context, getString(R.string.notice),
String.format(getString(R.string.invalid_authentication_password), password))
password = ""
}
when (title) {
getString(R.string.encrypt_password) ->
if (password != "") backup(password)
getString(R.string.decrypt_password) ->
if (password != "") restore(password)
else ->
AccountsActivity.setAuthPass(ua!!, password)
}
} }
when (title) { setNegativeButton(android.R.string.cancel) { dialog, _ ->
getString(R.string.encrypt_password) -> dialog.cancel()
if (password != "") backup(password)
getString(R.string.decrypt_password) ->
if (password != "") restore(password)
else ->
AccountsActivity.setAuthPass(ua!!, password)
} }
show()
} }
builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
}
builder.show()
} }
private fun askPasswords(accounts: MutableList<String>) { private fun askPasswords(accounts: MutableList<String>) {
@@ -1068,7 +1080,6 @@ class MainActivity : AppCompatActivity() {
if ((Utils.paramValue(params, "auth_user") != "") && if ((Utils.paramValue(params, "auth_user") != "") &&
(Utils.paramValue(params, "auth_pass") == "")) { (Utils.paramValue(params, "auth_pass") == "")) {
val aor = account.substringAfter("<").substringBefore(">") val aor = account.substringAfter("<").substringBefore(">")
val builder = AlertDialog.Builder(this)
val layout = LayoutInflater.from(this) val layout = LayoutInflater.from(this)
.inflate(R.layout.password_dialog, findViewById(android.R.id.content) as ViewGroup, .inflate(R.layout.password_dialog, findViewById(android.R.id.content) as ViewGroup,
false) false)
@@ -1085,24 +1096,27 @@ class MainActivity : AppCompatActivity() {
else else
input.transformationMethod = PasswordTransformationMethod() input.transformationMethod = PasswordTransformationMethod()
} }
builder.setView(layout) val context = this
builder.setPositiveButton(android.R.string.ok) { dialog, _ -> with (AlertDialog.Builder(this)) {
dialog.dismiss() setView(layout)
val password = input.text.toString().trim() setPositiveButton(android.R.string.ok) { dialog, _ ->
if (!Account.checkAuthPass(password)) { dialog.dismiss()
Utils.alertView(this, getString(R.string.notice), val password = input.text.toString().trim()
String.format(getString(R.string.invalid_authentication_password), password)) if (!Account.checkAuthPass(password)) {
} else { Utils.alertView(context, getString(R.string.notice),
aorPasswords.put(aor, password) String.format(getString(R.string.invalid_authentication_password), password))
} else {
aorPasswords.put(aor, password)
}
askPasswords(accounts)
} }
askPasswords(accounts) setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
aorPasswords.put(aor, "")
askPasswords(accounts)
}
show()
} }
builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel()
aorPasswords.put(aor, "")
askPasswords(accounts)
}
builder.show()
} else { } else {
askPasswords(accounts) askPasswords(accounts)
} }
@@ -1175,19 +1189,20 @@ class MainActivity : AppCompatActivity() {
return return
} }
Utils.deleteFile(File(zipFilePath)) Utils.deleteFile(File(zipFilePath))
val builder = AlertDialog.Builder(this) val titleView = View.inflate(this, R.layout.alert_title, null) as TextView
val titleView = LayoutInflater.from(this).inflate(R.layout.alert_title, null) as TextView
titleView.text = getString(R.string.info) titleView.text = getString(R.string.info)
builder.setCustomTitle(titleView) with (AlertDialog.Builder(this)) {
builder.setMessage(getString(R.string.restored)) setCustomTitle(titleView)
builder.setPositiveButton(getText(R.string.restart)) { dialog, _ -> setMessage(getString(R.string.restored))
quitRestart(true) setPositiveButton(getText(R.string.restart)) { dialog, _ ->
dialog.dismiss() quitRestart(true)
dialog.dismiss()
}
setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss()
}
show()
} }
builder.setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss()
}
builder.create().show()
} }
private fun spinToAor(aor: String) { private fun spinToAor(aor: String) {
app/src/main/res/values/styles.xml
-12
View File
@@ -16,16 +16,4 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<!-- Alert dialog theme -->
<style name="AlertDialogTheme" parent="ThemeOverlay.AppCompat.Dialog.Alert">
<item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
<item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
</style>
<style name="PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
<item name="android:textColor">@color/colorGreen</item>
</style>
<style name="NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
<item name="android:textColor">@color/colorAccent</item>
</style>
</resources> </resources>