Merge lp:~phablet-team/nuntium/update-july-first into lp:nuntium/packaging

[Alfonso Sanchez-Beato]

Use proxy and proxy port from ofono Settings property (LP: #1417976)

Use proxy and proxy port from ofono Settings property (LP: #1417976)

[Manuel de la Peña (mandel)]

Looks good after comparing the diff with the one in github.

review: Approve

[lp:~phablet-team/nuntium/update-july-first]

102. By Alfonso Sanchez-Beato on 2015-07-01

Refresh context properties after (de)activation

Refresh context properties after changing the Active property, as some
of them are dynamic and change after context activation / deactivation.

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-15 08:52:13 +0000
+++ debian/changelog	2015-07-01 16:34:14 +0000
@@ -1,3 +1,9 @@
+nuntium (1.4+15.10.20150701-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Use proxy and proxy port from ofono Settings property (LP: #1417976) 
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Wed, 01 Jul 2015 09:16:06 +0200
+
 nuntium (1.4+15.10.20150615-0ubuntu1) wily; urgency=medium
 
   [ Alfonso Sanchez-Beato (email Canonical) ]

=== modified file 'ofono/context_test.go'
--- ofono/context_test.go	2015-05-20 12:32:08 +0000
+++ ofono/context_test.go	2015-07-01 16:34:14 +0000
@@ -23,7 +23,6 @@
 
 import (
 	"errors"
-	"fmt"
 
 	"launchpad.net/go-dbus/v1"
 	. "launchpad.net/gocheck"
@@ -332,6 +331,12 @@
 		ObjectPath: "/ril_0/context1",
 		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true, false),
 	}
+	m := make(map[interface{}]interface{})
+	pr := dbus.Variant{proxy.Host}
+	pr_pt := dbus.Variant{uint16(proxy.Port)}
+	m["Proxy"] = &pr
+	m["ProxyPort"] = &pr_pt
+	context.Properties["Settings"] = dbus.Variant{m}
 
 	p, err := context.GetProxy()
 	c.Assert(err, IsNil)
@@ -349,24 +354,15 @@
 	c.Check(p, DeepEquals, ProxyInfo{})
 }
 
-func (s *ContextTestSuite) TestGetProxyWithHTTP(c *C) {
-	context := OfonoContext{
-		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true, false),
-	}
-	context.Properties["MessageProxy"] = dbus.Variant{fmt.Sprintf("http://%s:%d", proxy.Host, proxy.Port)}
-
-	p, err := context.GetProxy()
-	c.Assert(err, IsNil)
-	c.Check(p, DeepEquals, proxy)
-}
-
 func (s *ContextTestSuite) TestGetProxyNoPort(c *C) {
 	context := OfonoContext{
 		ObjectPath: "/ril_0/context1",
 		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true, false),
 	}
-	context.Properties["MessageProxy"] = dbus.Variant{fmt.Sprintf("http://%s", proxy.Host)}
+	m := make(map[interface{}]interface{})
+	pr := dbus.Variant{proxy.Host}
+	m["Proxy"] = &pr
+	context.Properties["Settings"] = dbus.Variant{m}
 
 	p, err := context.GetProxy()
 	c.Assert(err, IsNil)

=== modified file 'ofono/modem.go'
--- ofono/modem.go	2015-06-12 12:48:00 +0000
+++ ofono/modem.go	2015-07-01 16:34:14 +0000
@@ -25,10 +25,7 @@
 	"errors"
 	"fmt"
 	"log"
-	"net"
 	"reflect"
-	"strconv"
-	"strings"
 	"time"
 
 	"launchpad.net/go-dbus/v1"
@@ -70,6 +67,11 @@
 	Port uint64
 }
 
+const PROP_SETTINGS = "Settings"
+const SETTINGS_PROXY = "Proxy"
+const SETTINGS_PROXYPORT = "ProxyPort"
+const DBUS_CALL_GET_PROPERTIES = "GetProperties"
+
 func (p ProxyInfo) String() string {
 	return fmt.Sprintf("%s:%d", p.Host, p.Port)
 }
@@ -284,7 +286,18 @@
 	return false
 }
 
-func (context OfonoContext) toggleActive(state bool, conn *dbus.Connection) error {
+func (context *OfonoContext) getContextProperties(conn *dbus.Connection) {
+	ctxObj := conn.Object(OFONO_SENDER, context.ObjectPath)
+	if reply, err := ctxObj.Call(CONNECTION_CONTEXT_INTERFACE, DBUS_CALL_GET_PROPERTIES); err == nil {
+		if err := reply.Args(&context.Properties); err != nil {
+			log.Println("Cannot retrieve properties for", context.ObjectPath, err)
+		}
+	} else {
+		log.Println("Cannot get properties for", context.ObjectPath, err)
+	}
+}
+
+func (context *OfonoContext) toggleActive(state bool, conn *dbus.Connection) error {
 	log.Println("Trying to set Active property to", state, "for context on", state, context.ObjectPath)
 	obj := conn.Object("org.ofono", context.ObjectPath)
 	for i := 0; i < 3; i++ {
@@ -302,6 +315,8 @@
 				obj.Call(CONNECTION_CONTEXT_INTERFACE, "SetProperty",
 					"Preferred", dbus.Variant{true})
 			}
+			// Refresh context properties
+			context.getContextProperties(conn)
 			return nil
 		}
 	}
@@ -355,6 +370,54 @@
 	return ""
 }
 
+func (oContext OfonoContext) settingsProxy() string {
+	v, ok := oContext.Properties[PROP_SETTINGS]
+	if !ok {
+		return ""
+	}
+
+	settings, ok := v.Value.(map[interface{}]interface{})
+	if !ok {
+		return ""
+	}
+
+	proxy_v, ok := settings[SETTINGS_PROXY]
+	if !ok {
+		return ""
+	}
+
+	proxy, ok := proxy_v.(*dbus.Variant).Value.(string)
+	if !ok {
+		return ""
+	}
+
+	return proxy
+}
+
+func (oContext OfonoContext) settingsProxyPort() uint64 {
+	v, ok := oContext.Properties[PROP_SETTINGS]
+	if !ok {
+		return 80
+	}
+
+	settings, ok := v.Value.(map[interface{}]interface{})
+	if !ok {
+		return 80
+	}
+
+	port_v, ok := settings[SETTINGS_PROXYPORT]
+	if !ok {
+		return 80
+	}
+
+	port, ok := port_v.(*dbus.Variant).Value.(uint16)
+	if !ok {
+		return 80
+	}
+
+	return uint64(port)
+}
+
 func (oContext OfonoContext) GetMessageCenter() (string, error) {
 	if oContext.hasMessageCenter() {
 		return oContext.messageCenter(), nil
@@ -364,25 +427,16 @@
 }
 
 func (oContext OfonoContext) GetProxy() (proxyInfo ProxyInfo, err error) {
-	proxy := oContext.messageProxy()
+	proxy := oContext.settingsProxy()
 	// we need to support empty proxies
 	if proxy == "" {
-		return proxyInfo, nil
-	}
-	if strings.HasPrefix(proxy, "http://") {
-		proxy = proxy[len("http://"):]
-	}
-	var portString string
-	proxyInfo.Host, portString, err = net.SplitHostPort(proxy)
-	if err != nil {
-		proxyInfo.Host = proxy
-		proxyInfo.Port = 80
-		return proxyInfo, nil
-	}
-	proxyInfo.Port, err = strconv.ParseUint(portString, 0, 64)
-	if err != nil {
-		return proxyInfo, err
-	}
+		log.Println("No proxy in ofono settings")
+		return proxyInfo, nil
+	}
+
+	proxyInfo.Host = proxy
+	proxyInfo.Port = oContext.settingsProxyPort()
+
 	return proxyInfo, nil
 }
 
@@ -427,7 +481,7 @@
 func (modem *Modem) getProperty(interfaceName, propertyName string) (*dbus.Variant, error) {
 	errorString := "Cannot retrieve %s from %s for %s: %s"
 	rilObj := modem.conn.Object(OFONO_SENDER, modem.Modem)
-	if reply, err := rilObj.Call(interfaceName, "GetProperties"); err == nil {
+	if reply, err := rilObj.Call(interfaceName, DBUS_CALL_GET_PROPERTIES); err == nil {
 		var property PropertiesType
 		if err := reply.Args(&property); err != nil {
 			return nil, fmt.Errorf(errorString, propertyName, interfaceName, modem.Modem, err)