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

Use assert instead of manual if/exception.

Browse source
This commit is contained in:
Felix Ableitner 2014-11-17 10:59:03 +02:00
parent e430608311
commit 60bec11225
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/scala/com/nutomic/ensichat/bluetooth/ChatService.scala
View file

@ -1,6 +1,5 @@
package com.nutomic.ensichat.bluetooth package com.nutomic.ensichat.bluetooth
import java.security.InvalidParameterException
import java.util.{Date, UUID} import java.util.{Date, UUID}
import android.app.Service import android.app.Service
@ -9,10 +8,10 @@ import android.content.{BroadcastReceiver, Context, Intent, IntentFilter}
import android.os.Handler import android.os.Handler
import android.preference.PreferenceManager import android.preference.PreferenceManager
import android.util.Log import android.util.Log
import com.nutomic.ensichat.R
import com.nutomic.ensichat.bluetooth.ChatService.{OnConnectionChangedListener, OnMessageReceivedListener} import com.nutomic.ensichat.bluetooth.ChatService.{OnConnectionChangedListener, OnMessageReceivedListener}
import com.nutomic.ensichat.messages._ import com.nutomic.ensichat.messages._
import com.nutomic.ensichat.util.Database import com.nutomic.ensichat.util.Database
import com.nutomic.ensichat.{BuildConfig, R}
import scala.collection.SortedSet import scala.collection.SortedSet
import scala.collection.immutable.{HashMap, HashSet, TreeSet} import scala.collection.immutable.{HashMap, HashSet, TreeSet}
@ -209,9 +208,7 @@ class ChatService extends Service {
* Sends message to the device specified as receiver, * Sends message to the device specified as receiver,
*/ */
def send(message: Message): Unit = { def send(message: Message): Unit = {
if (BuildConfig.DEBUG && message.sender != localDeviceId) { assert(message.sender != localDeviceId, "Message must be sent from local device")
throw new InvalidParameterException("Message must be sent from local device")
}
connections.apply(message.receiver).send(message) connections.apply(message.receiver).send(message)
handleNewMessage(message) handleNewMessage(message)
} }
@ -224,9 +221,8 @@ class ChatService extends Service {
* Messages must always be sent between local device and a contact. * Messages must always be sent between local device and a contact.
*/ */
private def handleNewMessage(message: Message): Unit = { private def handleNewMessage(message: Message): Unit = {
if (BuildConfig.DEBUG && message.sender != localDeviceId && message.receiver != localDeviceId) { assert(message.sender != localDeviceId && message.receiver != localDeviceId,
throw new InvalidParameterException("Message must be sent or received by local device") "Message must be sent or received by local device")
}
Database.addMessage(message) Database.addMessage(message)
MainHandler.post(new Runnable { MainHandler.post(new Runnable {