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

Use future inside ChatService.sendTo(), log errors in future.

Browse source
This commit is contained in:
Felix Ableitner 2015-07-28 01:07:02 +02:00
parent ae814b73ba
commit b39fb514c1
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/scala/com/nutomic/ensichat/protocol/ChatService.scala
View file

@ -91,6 +91,8 @@ class ChatService extends Service {
btInterface.create()
Log.i(Tag, "Service started, address is " + crypto.localAddress)
}.onFailure { case e =>
Log.w(Tag, "Error in future", e)
}
}
@ -119,18 +121,22 @@ class ChatService extends Service {
* Sends a new message to the given target address.
*/
def sendTo(target: Address, body: MessageBody): Unit = {
if (!btInterface.getConnections.contains(target))
return
Future {
if (!btInterface.getConnections.contains(target))
return
val messageId = preferences.getLong("message_id", 0)
val header = new ContentHeader(crypto.localAddress, target, seqNumGenerator.next(),
body.contentType, messageId, new Date())
preferences.edit().putLong("message_id", messageId + 1)
val messageId = preferences.getLong("message_id", 0)
val header = new ContentHeader(crypto.localAddress, target, seqNumGenerator.next(),
body.contentType, messageId, new Date())
preferences.edit().putLong("message_id", messageId + 1)
val msg = new Message(header, body)
val encrypted = crypto.encrypt(crypto.sign(msg))
router.onReceive(encrypted)
onNewMessage(msg)
val msg = new Message(header, body)
val encrypted = crypto.encrypt(crypto.sign(msg))
router.onReceive(encrypted)
onNewMessage(msg)
}.onFailure { case e =>
Log.w(Tag, "Error in future", e)
}
}
private def sendVia(nextHop: Address, msg: Message) =