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
+74 -59
View File
@@ -201,13 +201,12 @@ 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) {
@@ -220,10 +219,11 @@ class MainActivity : AppCompatActivity() {
} }
dialog.dismiss() dialog.dismiss()
} }
builder.setNegativeButton(getString(R.string.no)) { dialog, _ -> setNegativeButton(getString(R.string.no)) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
} }
builder.create().show() 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()
} }
builder.create().show() show()
}
} else { } else {
quitTimer.cancel() quitTimer.cancel()
finishAndRemoveTask() finishAndRemoveTask()
@@ -685,14 +687,13 @@ 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")
@@ -709,7 +710,7 @@ class MainActivity : AppCompatActivity() {
dialog.dismiss() dialog.dismiss()
} }
} }
builder.setNegativeButton(getString(R.string.no)) { dialog, _ -> setNegativeButton(getString(R.string.no)) { dialog, _ ->
call.security = R.drawable.box_yellow call.security = R.drawable.box_yellow
call.zid = ev[3] call.zid = ev[3]
if (aor == aorSpinner.tag) { if (aor == aorSpinner.tag) {
@@ -719,7 +720,8 @@ class MainActivity : AppCompatActivity() {
} }
dialog.dismiss() dialog.dismiss()
} }
if (!isFinishing()) builder.create().show() 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)) {
setCustomTitle(titleView)
setMessage(String.format(getString(R.string.transfer_query),
target)) target))
transferDialog.setPositiveButton(getString(R.string.yes)) { dialog, _ -> setPositiveButton(getString(R.string.yes)) { dialog, _ ->
if (call in Call.calls()) if (call in Call.calls())
Api.ua_hangup(uap, callp, 0, "") Api.ua_hangup(uap, callp, 0, "")
call(ua, ev[1], "transferring") call(ua, ev[1], "transferring")
showCall(ua) showCall(ua)
dialog.dismiss() dialog.dismiss()
} }
transferDialog.setNegativeButton(getString(R.string.no)) { dialog, _ -> setNegativeButton(getString(R.string.no)) { dialog, _ ->
if (call in Call.calls()) if (call in Call.calls())
call.notifySipfrag(603, "Decline") call.notifySipfrag(603, "Decline")
dialog.dismiss() dialog.dismiss()
} }
transferDialog.create().show() 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)) {
setCustomTitle(titleView)
setMessage(getString(R.string.config_restart))
setPositiveButton(getText(R.string.restart)) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
quitRestart(true) quitRestart(true)
} }
restartDialog.setNegativeButton(getText(R.string.cancel)) { dialog, _ -> setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
} }
restartDialog.create().show() 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,12 +1046,14 @@ 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)) {
setView(layout)
setPositiveButton(android.R.string.ok) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
var password = input.text.toString().trim() var password = input.text.toString().trim()
if (!Account.checkAuthPass(password)) { if (!Account.checkAuthPass(password)) {
Utils.alertView(this, getString(R.string.notice), Utils.alertView(context, getString(R.string.notice),
String.format(getString(R.string.invalid_authentication_password), password)) String.format(getString(R.string.invalid_authentication_password), password))
password = "" password = ""
} }
@@ -1055,10 +1066,11 @@ class MainActivity : AppCompatActivity() {
AccountsActivity.setAuthPass(ua!!, password) AccountsActivity.setAuthPass(ua!!, password)
} }
} }
builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel() dialog.cancel()
} }
builder.show() 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)) {
setView(layout)
setPositiveButton(android.R.string.ok) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
val password = input.text.toString().trim() val password = input.text.toString().trim()
if (!Account.checkAuthPass(password)) { if (!Account.checkAuthPass(password)) {
Utils.alertView(this, getString(R.string.notice), Utils.alertView(context, getString(R.string.notice),
String.format(getString(R.string.invalid_authentication_password), password)) String.format(getString(R.string.invalid_authentication_password), password))
} else { } else {
aorPasswords.put(aor, password) aorPasswords.put(aor, password)
} }
askPasswords(accounts) askPasswords(accounts)
} }
builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.cancel() dialog.cancel()
aorPasswords.put(aor, "") aorPasswords.put(aor, "")
askPasswords(accounts) askPasswords(accounts)
} }
builder.show() 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))
setPositiveButton(getText(R.string.restart)) { dialog, _ ->
quitRestart(true) quitRestart(true)
dialog.dismiss() dialog.dismiss()
} }
builder.setNegativeButton(getText(R.string.cancel)) { dialog, _ -> setNegativeButton(getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss() dialog.dismiss()
} }
builder.create().show() 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>