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

more calls/messages/contacts improvements

Browse Source
This commit is contained in:
Juha Heinanen
2018-08-01 14:54:21 +03:00
parent d251a67e66
commit cf51099d37
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
+4 -5
View File
@@ -51,7 +51,6 @@ class CallsActivity : AppCompatActivity() {
val i = Intent(this, ContactActivity::class.java) val i = Intent(this, ContactActivity::class.java)
val b = Bundle() val b = Bundle()
b.putBoolean("new", true) b.putBoolean("new", true)
b.putString("name", "New Name")
b.putString("uri", uaHistory[pos].peerURI) b.putString("uri", uaHistory[pos].peerURI)
i.putExtras(b) i.putExtras(b)
startActivityForResult(i, MainActivity.CONTACT_CODE) startActivityForResult(i, MainActivity.CONTACT_CODE)
@@ -72,15 +71,15 @@ class CallsActivity : AppCompatActivity() {
val builder = AlertDialog.Builder(this@CallsActivity, R.style.Theme_AppCompat) val builder = AlertDialog.Builder(this@CallsActivity, R.style.Theme_AppCompat)
if (ContactsActivity.contactName(uaHistory[pos].peerURI).startsWith("sip:")) if (ContactsActivity.contactName(uaHistory[pos].peerURI).startsWith("sip:"))
builder.setMessage("Do you want to add ${uaHistory[pos].peerURI} to contacs or " + builder.setMessage("Do you want to add ${uaHistory[pos].peerURI} to contacs or " +
"delete call(s) from history?") "delete call from history?")
.setPositiveButton("Cancel", dialogClickListener) .setPositiveButton("Cancel", dialogClickListener)
.setNegativeButton("Delete History", dialogClickListener) .setNegativeButton("Delete Call", dialogClickListener)
.setNeutralButton("Add Contact", dialogClickListener) .setNeutralButton("Add Contact", dialogClickListener)
.show() .show()
else else
builder.setMessage("Do you want to delete call(s) from history?") builder.setMessage("Do you want to delete call from history?")
.setPositiveButton("Cancel", dialogClickListener) .setPositiveButton("Cancel", dialogClickListener)
.setNegativeButton("Delete History", dialogClickListener) .setNegativeButton("Delete Call", dialogClickListener)
.show() .show()
true true
} }
app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+7 -2
View File
@@ -20,13 +20,18 @@ class ContactActivity : AppCompatActivity() {
nameView = findViewById(R.id.Name) as EditText nameView = findViewById(R.id.Name) as EditText
uriView = findViewById(R.id.Uri) as EditText uriView = findViewById(R.id.Uri) as EditText
val uri = intent.extras.getString("uri")
if (intent.extras.getBoolean("new")) { if (intent.extras.getBoolean("new")) {
setTitle("New Contact") setTitle("New Contact")
nameView.setText("") nameView.setText("")
nameView.hint = "Contact name" nameView.hint = "Contact name"
nameView.setSelection(nameView.text.length) nameView.setSelection(nameView.text.length)
uriView.setText("") if (uri == "") {
uriView.hint = "SIP URI" uriView.setText("")
uriView.hint = "SIP URI"
} else {
uriView.setText(uri)
}
} else { } else {
index = intent.extras.getInt("index") index = intent.extras.getInt("index")
val name = ContactsActivity.contacts[index].name val name = ContactsActivity.contacts[index].name
app/src/main/kotlin/com/tutpro/baresip/MessagesActivity.kt
+2 -3
View File
@@ -55,7 +55,6 @@ class MessagesActivity: AppCompatActivity() {
val i = Intent(this, ContactActivity::class.java) val i = Intent(this, ContactActivity::class.java)
val b = Bundle() val b = Bundle()
b.putBoolean("new", true) b.putBoolean("new", true)
b.putString("name", "New Name")
b.putString("uri", uaMessages[pos].peerURI) b.putString("uri", uaMessages[pos].peerURI)
i.putExtras(b) i.putExtras(b)
startActivityForResult(i, MainActivity.CONTACT_CODE) startActivityForResult(i, MainActivity.CONTACT_CODE)
@@ -81,13 +80,13 @@ class MessagesActivity: AppCompatActivity() {
builder.setMessage("Do you want to add ${uaMessages[pos].peerURI} to contacs or " + builder.setMessage("Do you want to add ${uaMessages[pos].peerURI} to contacs or " +
"delete message from history?") "delete message from history?")
.setPositiveButton("Cancel", dialogClickListener) .setPositiveButton("Cancel", dialogClickListener)
.setNegativeButton("Delete History", dialogClickListener) .setNegativeButton("Delete Message", dialogClickListener)
.setNeutralButton("Add Contact", dialogClickListener) .setNeutralButton("Add Contact", dialogClickListener)
.show() .show()
else else
builder.setMessage("Do you want to delete message from history?") builder.setMessage("Do you want to delete message from history?")
.setPositiveButton("Cancel", dialogClickListener) .setPositiveButton("Cancel", dialogClickListener)
.setNegativeButton("Delete History", dialogClickListener) .setNegativeButton("Delete Message", dialogClickListener)
.show() .show()
true true
} }