nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor fixes.

Browse source
This commit is contained in:
Felix Ableitner 2015-02-09 21:40:19 +01:00
parent 3567b88c0d
commit 0410aa9a2b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/scala/com/nutomic/ensichat/activities/ConfirmAddContactDialog.scala
View file

@ -64,6 +64,7 @@ class ConfirmAddContactDialog extends EnsiChatActivity with OnMessageReceivedLis
.setCancelable(false)
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this)
.setCancelable(false)
.show()
}
@ -74,6 +75,7 @@ class ConfirmAddContactDialog extends EnsiChatActivity with OnMessageReceivedLis
addContactIfBothConfirmed()
true
case DialogInterface.BUTTON_NEGATIVE =>
finish()
false
}
service.sendTo(user.Address, new ResultAddContact(result))
@ -85,7 +87,7 @@ class ConfirmAddContactDialog extends EnsiChatActivity with OnMessageReceivedLis
private def addContactIfBothConfirmed(): Unit = {
if (localConfirmed && remoteConfirmed) {
Log.i(Tag, "Adding new contact " + user.toString)
// Get the user again, in case
// Get the user again, in case it was updated in the mean time.
service.database.addContact(service.getUser(user.Address))
Toast.makeText(this, getString(R.string.contact_added, user.Name), Toast.LENGTH_SHORT)
.show()