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

Properly check if user is a contact.

Browse source
This commit is contained in:
Felix Ableitner 2016-01-24 13:17:02 +01:00
parent 244fd32762
commit d3c2b5ee26
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/main/scala/com/nutomic/ensichat/activities/ConnectionsActivity.scala
View file

@ -120,7 +120,7 @@ class ConnectionsActivity extends EnsichatActivity with OnItemClickListener {
val user = service.get.getUser(parsedAddress) val user = service.get.getUser(parsedAddress)
if (database.getContacts.contains(user)) { if (database.getContacts.map(_.address).contains(user.address)) {
val text = getString(R.string.contact_already_added, user.name) val text = getString(R.string.contact_already_added, user.name)
Toast.makeText(this, text, Toast.LENGTH_SHORT).show() Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
return return

4
android/src/main/scala/com/nutomic/ensichat/util/Database.scala
View file

@ -128,7 +128,7 @@ class Database(context: Context) extends DatabaseInterface {
def addContact(contact: User): Unit = { def addContact(contact: User): Unit = {
val cv = new ContentValues() val cv = new ContentValues()
cv.put("address", contact.address.toString) cv.put("address", contact.address.toString())
cv.put("name", contact.name) cv.put("name", contact.name)
cv.put("status", contact.status) cv.put("status", contact.status)
helper.getWritableDatabase.insert("contacts", null, cv) helper.getWritableDatabase.insert("contacts", null, cv)
@ -139,7 +139,7 @@ class Database(context: Context) extends DatabaseInterface {
val cv = new ContentValues() val cv = new ContentValues()
cv.put("name", contact.name) cv.put("name", contact.name)
cv.put("status", contact.status) cv.put("status", contact.status)
helper.getWritableDatabase.update("contacts", cv, "address = ?", Array(contact.address.toString)) helper.getWritableDatabase.update("contacts", cv, "address = ?", Array(contact.address.toString()))
contactsUpdated() contactsUpdated()
} }