Merge lp:~sergiusens/nuntium/telepathy_switch into lp:nuntium

[Sergio Schvezov]

Improving incoming dbus method call handling for the mms service interface

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'telepathy/service.go'
--- telepathy/service.go	2014-04-28 17:34:06 +0000
+++ telepathy/service.go	2014-07-01 12:15:58 +0000
@@ -79,8 +79,13 @@
 	var reply *dbus.Message
 
 	for msg := range service.msgChan {
-		switch {
-		case msg.Interface == MMS_SERVICE_DBUS_IFACE && msg.Member == "GetMessages":
+		if msg.Interface != MMS_SERVICE_DBUS_IFACE {
+			log.Println("Received unkown method call on", msg.Interface, msg.Member)
+			reply = dbus.NewErrorMessage(msg, "org.freedesktop.DBus.Error.UnknownMethod", "Unknown method")
+			continue
+		}
+		switch msg.Member {
+		case "GetMessages":
 			reply = dbus.NewMethodReturnMessage(msg)
 			//TODO implement store and forward
 			var payload []ServicePayload
@@ -88,7 +93,7 @@
 				log.Print("Cannot parse payload data from services")
 				reply = dbus.NewErrorMessage(msg, "Error.InvalidArguments", "Cannot parse services")
 			}
-		case msg.Interface == MMS_SERVICE_DBUS_IFACE && msg.Member == "GetProperties":
+		case "GetProperties":
 			reply = dbus.NewMethodReturnMessage(msg)
 			if err := reply.AppendArgs(service.Properties); err != nil {
 				log.Print("Cannot parse payload data from services")