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

[Sergio Schvezov]

Allow context selection over the org.ofono.mms.Service interface

More details here http://people.canonical.com/~sergiusens/mms/context_select/README.md

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/nuntium-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nuntium-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/nuntium/select_that]

77. By Sergio Schvezov on 2014-09-29

Adding log on what is being tried for activation

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/nuntium-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nuntium-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

My go-fu is bad, but I don't see the service notifying when the PreferredContext property changes.

It's also problematic that the property sometimes is available and sometimes it's not. I can work around this in the bindings, but I need two things:

1) instead of adding/removing the property, have a "not set" value (empty string would do just fine) and have the interface report PropertyChanged signal each time the property is modified
2) or add a straight signal PreferredContextChangede when you add or remove the property.

Current implementation makes it really difficult (or almost impossible) to write bindings on Qt.

review: Needs Fixing

[lp:~sergiusens/nuntium/select_that]

78. By Sergio Schvezov on 2014-09-30

Minor cleanup, always refreshed from stored context state

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:78
http://jenkins.qa.ubuntu.com/job/nuntium-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-amd64-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nuntium-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/nuntium/select_that]

79. By Sergio Schvezov on 2014-09-30

Emitting properties changed for preferred context and always having the property set

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/nuntium-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nuntium-ci/14/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

This now produces messages like

phablet@ubuntu-phablet:~$ dbus-monitor interface=org.ofono.mms.Service
signal sender=org.freedesktop.DBus -> dest=:1.192 serial=2 path=/org/freedesktop/DBus; interface=org.freedesktop.DBus; member=NameAcquired
   string ":1.192"
method call sender=:1.193 -> dest=org.ofono.mms serial=2 path=/org/ofono/mms/722341240403394; interface=org.ofono.mms.Service; member=SetProperty
   string "PreferredContext"
   variant object path "/c2"
signal sender=:1.190 -> dest=(null destination) serial=9 path=/org/ofono/mms/722341240403394; interface=org.ofono.mms.Service; member=PropertyChanged
   string "PreferredContext"
   variant object path "/c2

And always has the "property" set.

[Antti Kaijanmäki (kaijanmaki)]

OK. looks good to me.

review: Approve

[Ricardo Salveti (rsalveti)]

review: Needs Fixing

[lp:~sergiusens/nuntium/select_that]

80. By Sergio Schvezov on 2014-10-01

Removing stale log line

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/nuntium-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nuntium-utopic-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nuntium-ci/15/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

review: Approve

=== modified file 'mediator.go'
--- mediator.go	2014-09-23 19:58:36 +0000
+++ mediator.go	2014-10-01 13:57:00 +0000
@@ -164,11 +164,15 @@
 }
 
 func (mediator *Mediator) getMRetrieveConf(mNotificationInd *mms.MNotificationInd) {
-	mmsContext, err := mediator.modem.ActivateMMSContext()
+	preferredContext, _ := mediator.telepathyService.GetPreferredContext()
+	mmsContext, err := mediator.modem.ActivateMMSContext(preferredContext)
 	if err != nil {
 		log.Print("Cannot activate ofono context: ", err)
 		return
 	}
+	if err := mediator.telepathyService.SetPreferredContext(mmsContext.ObjectPath); err != nil {
+		log.Println("Unable to store the preferred context for MMS:", err)
+	}
 	proxy, err := mmsContext.GetProxy()
 	if err != nil {
 		log.Print("Error retrieving proxy: ", err)
@@ -356,10 +360,14 @@
 }
 
 func (mediator *Mediator) uploadFile(filePath string) (string, error) {
-	mmsContext, err := mediator.modem.ActivateMMSContext()
+	preferredContext, _ := mediator.telepathyService.GetPreferredContext()
+	mmsContext, err := mediator.modem.ActivateMMSContext(preferredContext)
 	if err != nil {
 		return "", err
 	}
+	if err := mediator.telepathyService.SetPreferredContext(mmsContext.ObjectPath); err != nil {
+		log.Println("Unable to store the preferred context for MMS:", err)
+	}
 	proxy, err := mmsContext.GetProxy()
 	if err != nil {
 		return "", err

=== modified file 'ofono/context_test.go'
--- ofono/context_test.go	2014-09-18 01:47:59 +0000
+++ ofono/context_test.go	2014-10-01 13:57:00 +0000
@@ -72,7 +72,7 @@
 }
 
 func (s *ContextTestSuite) TestNoContext(c *C) {
-	context, err := s.modem.GetMMSContexts()
+	context, err := s.modem.GetMMSContexts("")
 	c.Check(context, IsNil)
 	c.Assert(err, DeepEquals, errors.New("No mms contexts found"))
 }
@@ -84,7 +84,7 @@
 	}
 	s.contexts = append(s.contexts, context1)
 
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 1)
 	c.Check(contexts[0], DeepEquals, context1)
@@ -97,7 +97,7 @@
 	}
 	s.contexts = append(s.contexts, context1)
 
-	context, err := s.modem.GetMMSContexts()
+	context, err := s.modem.GetMMSContexts("")
 	c.Check(context, IsNil)
 	c.Assert(err, DeepEquals, errors.New("No mms contexts found"))
 }
@@ -109,7 +109,7 @@
 	}
 	s.contexts = append(s.contexts, context1)
 
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 1)
 	c.Check(contexts[0], DeepEquals, context1)
@@ -128,7 +128,7 @@
 	}
 	s.contexts = append(s.contexts, context2)
 
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 1)
 	c.Check(contexts[0], DeepEquals, context2)
@@ -147,7 +147,7 @@
 	}
 	s.contexts = append(s.contexts, context2)
 
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 1)
 	c.Check(contexts[0], DeepEquals, context2)
@@ -166,7 +166,7 @@
 	}
 	s.contexts = append(s.contexts, context2)
 
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 2)
 	c.Check(contexts[0], DeepEquals, context1)
@@ -192,9 +192,7 @@
 	}
 	s.contexts = append(s.contexts, context3)
 
-	s.modem.preferredContext = "/ril_0/context2"
-
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("/ril_0/context2")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 3)
 	c.Check(contexts[0], DeepEquals, context2)
@@ -221,9 +219,7 @@
 	}
 	s.contexts = append(s.contexts, context3)
 
-	s.modem.preferredContext = "/ril_0/context25"
-
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("/ril_0/context25")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 3)
 	c.Check(contexts[0], DeepEquals, context1)
@@ -234,7 +230,7 @@
 func (s *ContextTestSuite) TestMMSMoreThanOneValidContext2Active(c *C) {
 	context0 := OfonoContext{
 		ObjectPath: "/ril_0/context0",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, false, true, false),
+		Properties: makeGenericContextProperty("Context0", contextTypeInternet, false, true, false),
 	}
 	s.contexts = append(s.contexts, context0)
 
@@ -254,10 +250,9 @@
 		ObjectPath: "/ril_0/context3",
 		Properties: makeGenericContextProperty("Context3", contextTypeMMS, true, true, false),
 	}
-
 	s.contexts = append(s.contexts, context3)
 
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 3)
 	c.Check(contexts[0], DeepEquals, context3)
@@ -291,9 +286,7 @@
 
 	s.contexts = append(s.contexts, context3)
 
-	s.modem.preferredContext = "/ril_0/context3"
-
-	contexts, err := s.modem.GetMMSContexts()
+	contexts, err := s.modem.GetMMSContexts("/ril_0/context3")
 	c.Assert(err, IsNil)
 	c.Assert(len(contexts), Equals, 4)
 	c.Check(contexts[0], DeepEquals, context3)

=== modified file 'ofono/modem.go'
--- ofono/modem.go	2014-09-18 01:47:59 +0000
+++ ofono/modem.go	2014-10-01 13:57:00 +0000
@@ -48,7 +48,6 @@
 	Modem                  dbus.ObjectPath
 	PushAgent              *PushAgent
 	identity               string
-	preferredContext       dbus.ObjectPath
 	IdentityAdded          chan string
 	IdentityRemoved        chan string
 	endWatch               chan bool
@@ -235,8 +234,8 @@
 //If the context is already active it's a nop.
 //Returns either the type=internet context or the type=mms, if none is found
 //an error is returned.
-func (modem *Modem) ActivateMMSContext() (OfonoContext, error) {
-	contexts, err := modem.GetMMSContexts()
+func (modem *Modem) ActivateMMSContext(preferredContext dbus.ObjectPath) (OfonoContext, error) {
+	contexts, err := modem.GetMMSContexts(preferredContext)
 	if err != nil {
 		return OfonoContext{}, err
 	}
@@ -244,12 +243,12 @@
 		if context.isActive() {
 			return context, nil
 		}
+		log.Println("Trying to activate context on", context.ObjectPath)
 		obj := modem.conn.Object("org.ofono", context.ObjectPath)
 		_, err = obj.Call(CONNECTION_CONTEXT_INTERFACE, "SetProperty", "Active", dbus.Variant{true})
 		if err != nil {
-			log.Println("Cannot Activate interface on %s: %s", context.ObjectPath, err)
+			log.Printf("Cannot Activate interface on %s: %s", context.ObjectPath, err)
 		} else {
-			modem.preferredContext = context.ObjectPath
 			return context, nil
 		}
 	}
@@ -303,11 +302,12 @@
 //
 //Returns either the type=internet context or the type=mms, if none is found
 //an error is returned.
-func (modem *Modem) GetMMSContexts() (mmsContexts []OfonoContext, err error) {
+func (modem *Modem) GetMMSContexts(preferredContext dbus.ObjectPath) (mmsContexts []OfonoContext, err error) {
 	contexts, err := getOfonoProps(modem.conn, modem.Modem, OFONO_SENDER, CONNECTION_MANAGER_INTERFACE, "GetContexts")
 	if err != nil {
 		return mmsContexts, err
 	}
+
 	for _, context := range contexts {
 		var name, contextType, msgCenter, msgProxy string
 		var active bool
@@ -335,7 +335,7 @@
 			"| MessageProxy:", msgProxy,
 			"| Active:", active)
 		if (contextType == contextTypeInternet && active && msgCenter != "") || contextType == contextTypeMMS {
-			if context.ObjectPath == modem.preferredContext || active {
+			if context.ObjectPath == preferredContext || active {
 				mmsContexts = append([]OfonoContext{context}, mmsContexts...)
 			} else {
 				mmsContexts = append(mmsContexts, context)

=== added file 'storage/context.go'
--- storage/context.go	1970-01-01 00:00:00 +0000
+++ storage/context.go	2014-10-01 13:57:00 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * Authors:
+ * Sergio Schvezov: [e-mail]
+ *
+ * This file is part of telepathy.
+ *
+ * mms is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * mms is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package storage
+
+import (
+	"bufio"
+	"encoding/json"
+	"errors"
+	"os"
+	"path/filepath"
+	"sync"
+
+	"log"
+
+	"launchpad.net/go-dbus/v1"
+	"launchpad.net/go-xdg/v0"
+)
+
+var preferredContextPath string = filepath.Join(filepath.Base(os.Args[0]), "preferredContext")
+
+var contextMutex sync.Mutex
+
+type contextSettingMap map[string]dbus.ObjectPath
+
+func SetPreferredContext(identity string, pcObjectPath dbus.ObjectPath) error {
+	contextMutex.Lock()
+	defer contextMutex.Unlock()
+
+	pcFilePath, err := xdg.Cache.Ensure(preferredContextPath)
+	if err != nil {
+		return err
+	}
+	return writeContext(identity, pcObjectPath, pcFilePath)
+}
+
+func GetPreferredContext(identity string) (pcObjectPath dbus.ObjectPath, err error) {
+	contextMutex.Lock()
+	defer contextMutex.Unlock()
+
+	pcFilePath, err := xdg.Cache.Find(preferredContextPath)
+	if err != nil {
+		return pcObjectPath, err
+	}
+	cs, err := readContext(pcFilePath)
+	if err != nil {
+		return pcObjectPath, err
+	}
+	if p, ok := cs[identity]; ok {
+		return p, nil
+	}
+
+	return pcObjectPath, errors.New("path for identity not found")
+}
+
+func readContext(storePath string) (cs contextSettingMap, err error) {
+	file, err := os.Open(storePath)
+	if err != nil {
+		cs = make(contextSettingMap)
+		return cs, err
+	}
+	jsonReader := json.NewDecoder(file)
+	if err = jsonReader.Decode(&cs); err != nil {
+		cs = make(contextSettingMap)
+	}
+	return cs, err
+}
+
+func writeContext(identity string, pc dbus.ObjectPath, storePath string) error {
+	cs, readErr := readContext(storePath)
+	if readErr != nil {
+		log.Println("Cannot read previous context state")
+	}
+
+	file, err := os.Create(storePath)
+	if err != nil {
+		log.Println(err)
+		return err
+	}
+	defer func() {
+		file.Close()
+		if err != nil {
+			os.Remove(storePath)
+		}
+	}()
+	w := bufio.NewWriter(file)
+	defer w.Flush()
+	cs[identity] = pc
+	jsonWriter := json.NewEncoder(w)
+	if err := jsonWriter.Encode(cs); err != nil {
+		log.Println(err)
+		return err
+	}
+	return nil
+}

=== modified file 'telepathy/const.go'
--- telepathy/const.go	2014-08-12 20:50:25 +0000
+++ telepathy/const.go	2014-10-01 13:57:00 +0000
@@ -30,15 +30,16 @@
 )
 
 const (
-	IDENTITY             = "Identity"
-	USE_DELIVERY_REPORTS = "UseDeliveryReports"
-	MODEM_OBJECT_PATH    = "ModemObjectPath"
-	MESSAGE_ADDED        = "MessageAdded"
-	MESSAGE_REMOVED      = "MessageRemoved"
-	SERVICE_ADDED        = "ServiceAdded"
-	SERVICE_REMOVED      = "ServiceRemoved"
-	PROPERTY_CHANGED     = "PropertyChanged"
-	STATUS               = "Status"
+	identityProperty           string = "Identity"
+	useDeliveryReportsProperty string = "UseDeliveryReports"
+	modemObjectPathProperty    string = "ModemObjectPath"
+	messageAddedSignal         string = "MessageAdded"
+	messageRemovedSignal       string = "MessageRemoved"
+	serviceAddedSignal         string = "ServiceAdded"
+	serviceRemovedSignal       string = "ServiceRemoved"
+	preferredContextProperty   string = "PreferredContext"
+	propertyChangedSignal      string = "PropertyChanged"
+	statusProperty             string = "Status"
 )
 
 const (

=== modified file 'telepathy/manager.go'
--- telepathy/manager.go	2014-08-12 20:50:25 +0000
+++ telepathy/manager.go	2014-10-01 13:57:00 +0000
@@ -82,7 +82,7 @@
 
 func (manager *MMSManager) serviceAdded(payload *Payload) error {
 	log.Print("Service added ", payload.Path)
-	signal := dbus.NewSignalMessage(MMS_DBUS_PATH, MMS_MANAGER_DBUS_IFACE, SERVICE_ADDED)
+	signal := dbus.NewSignalMessage(MMS_DBUS_PATH, MMS_MANAGER_DBUS_IFACE, serviceAddedSignal)
 	if err := signal.AppendArgs(payload.Path, payload.Properties); err != nil {
 		return err
 	}
@@ -108,7 +108,7 @@
 
 func (manager *MMSManager) serviceRemoved(payload *Payload) error {
 	log.Print("Service removed ", payload.Path)
-	signal := dbus.NewSignalMessage(MMS_DBUS_PATH, MMS_MANAGER_DBUS_IFACE, SERVICE_REMOVED)
+	signal := dbus.NewSignalMessage(MMS_DBUS_PATH, MMS_MANAGER_DBUS_IFACE, serviceRemovedSignal)
 	if err := signal.AppendArgs(payload.Path); err != nil {
 		return err
 	}

=== modified file 'telepathy/message.go'
--- telepathy/message.go	2014-07-02 21:06:14 +0000
+++ telepathy/message.go	2014-10-01 13:57:00 +0000
@@ -94,8 +94,8 @@
 	i := validStatus.Search(status)
 	if i < validStatus.Len() && validStatus[i] == status {
 		msgInterface.status = status
-		signal := dbus.NewSignalMessage(msgInterface.objectPath, MMS_MESSAGE_DBUS_IFACE, PROPERTY_CHANGED)
-		if err := signal.AppendArgs(STATUS, dbus.Variant{status}); err != nil {
+		signal := dbus.NewSignalMessage(msgInterface.objectPath, MMS_MESSAGE_DBUS_IFACE, propertyChangedSignal)
+		if err := signal.AppendArgs(statusProperty, dbus.Variant{status}); err != nil {
 			return err
 		}
 		if err := msgInterface.conn.Send(signal); err != nil {

=== modified file 'telepathy/service.go'
--- telepathy/service.go	2014-08-12 20:50:25 +0000
+++ telepathy/service.go	2014-10-01 13:57:00 +0000
@@ -22,9 +22,11 @@
 package telepathy
 
 import (
+	"errors"
 	"fmt"
 	"log"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"time"
 
@@ -73,10 +75,10 @@
 
 func NewMMSService(conn *dbus.Connection, modemObjPath dbus.ObjectPath, identity string, outgoingChannel chan *OutgoingMessage, useDeliveryReports bool) *MMSService {
 	properties := make(map[string]dbus.Variant)
-	properties[IDENTITY] = dbus.Variant{identity}
+	properties[identityProperty] = dbus.Variant{identity}
 	serviceProperties := make(map[string]dbus.Variant)
-	serviceProperties[USE_DELIVERY_REPORTS] = dbus.Variant{useDeliveryReports}
-	serviceProperties[MODEM_OBJECT_PATH] = dbus.Variant{modemObjPath}
+	serviceProperties[useDeliveryReportsProperty] = dbus.Variant{useDeliveryReports}
+	serviceProperties[modemObjectPathProperty] = dbus.Variant{modemObjPath}
 	payload := Payload{
 		Path:       dbus.ObjectPath(MMS_DBUS_PATH + "/" + identity),
 		Properties: properties,
@@ -130,6 +132,12 @@
 			}
 		case "GetProperties":
 			reply = dbus.NewMethodReturnMessage(msg)
+			if pc, err := service.GetPreferredContext(); err == nil {
+				service.Properties[preferredContextProperty] = dbus.Variant{pc}
+			} else {
+				// Using "/" as an invalid 'path' even though it could be considered 'incorrect'
+				service.Properties[preferredContextProperty] = dbus.Variant{dbus.ObjectPath("/")}
+			}
 			if err := reply.AppendArgs(service.Properties); err != nil {
 				log.Print("Cannot parse payload data from services")
 				reply = dbus.NewErrorMessage(msg, "Error.InvalidArguments", "Cannot parse services")
@@ -137,6 +145,16 @@
 			if err := service.conn.Send(reply); err != nil {
 				log.Println("Could not send reply:", err)
 			}
+		case "SetProperty":
+			if err := service.setProperty(msg); err != nil {
+				log.Println("Property set failed:", err)
+				reply = dbus.NewErrorMessage(msg, "Error.InvalidArguments", err.Error())
+			} else {
+				reply = dbus.NewMethodReturnMessage(msg)
+			}
+			if err := service.conn.Send(reply); err != nil {
+				log.Println("Could not send reply:", err)
+			}
 		case "SendMessage":
 			var outMessage OutgoingMessage
 			outMessage.Reply = dbus.NewMethodReturnMessage(msg)
@@ -175,6 +193,44 @@
 	return uuid, nil
 }
 
+func (service *MMSService) SetPreferredContext(context dbus.ObjectPath) error {
+	// make set a noop if we are setting the same thing
+	if pc, err := service.GetPreferredContext(); err != nil && context == pc {
+		return nil
+	}
+
+	if err := storage.SetPreferredContext(service.identity, context); err != nil {
+		return err
+	}
+	signal := dbus.NewSignalMessage(service.payload.Path, MMS_SERVICE_DBUS_IFACE, propertyChangedSignal)
+	if err := signal.AppendArgs(preferredContextProperty, dbus.Variant{context}); err != nil {
+		return err
+	}
+	return service.conn.Send(signal)
+}
+
+func (service *MMSService) GetPreferredContext() (dbus.ObjectPath, error) {
+	return storage.GetPreferredContext(service.identity)
+}
+
+func (service *MMSService) setProperty(msg *dbus.Message) error {
+	var propertyName string
+	var propertyValue dbus.Variant
+	if err := msg.Args(&propertyName, &propertyValue); err != nil {
+		return err
+	}
+
+	switch propertyName {
+	case preferredContextProperty:
+		preferredContextObjectPath := dbus.ObjectPath(reflect.ValueOf(propertyValue.Value).String())
+		service.Properties[preferredContextProperty] = dbus.Variant{preferredContextObjectPath}
+		return service.SetPreferredContext(preferredContextObjectPath)
+	default:
+		errors.New("property cannot be set")
+	}
+	return errors.New("unhandled property")
+}
+
 //MessageRemoved emits the MessageRemoved signal with the path of the removed
 //message.
 //It also actually removes the message from storage.
@@ -190,7 +246,7 @@
 		return err
 	}
 
-	signal := dbus.NewSignalMessage(service.payload.Path, MMS_SERVICE_DBUS_IFACE, MESSAGE_REMOVED)
+	signal := dbus.NewSignalMessage(service.payload.Path, MMS_SERVICE_DBUS_IFACE, messageRemovedSignal)
 	if err := signal.AppendArgs(objectPath); err != nil {
 		return err
 	}
@@ -214,7 +270,7 @@
 //MessageAdded emits a MessageAdded with the path to the added message which
 //is taken as a parameter
 func (service *MMSService) MessageAdded(msgPayload *Payload) error {
-	signal := dbus.NewSignalMessage(service.payload.Path, MMS_SERVICE_DBUS_IFACE, MESSAGE_ADDED)
+	signal := dbus.NewSignalMessage(service.payload.Path, MMS_SERVICE_DBUS_IFACE, messageAddedSignal)
 	if err := signal.AppendArgs(msgPayload.Path, msgPayload.Properties); err != nil {
 		return err
 	}