From: Denis Kenzior <denkenz@gmail.com>
Date: Fri, 30 Oct 2009 20:23:27 +0000 (-0500)
Subject: Add saving / restoring of netreg settings
X-Git-Tag: 0.9~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc5701c76f51d3259dfadf8f55faf213925d4a98;p=platform%2Fupstream%2Fofono.git

Add saving / restoring of netreg settings
---

diff --git a/src/network.c b/src/network.c
index b581d00..42244c1 100644
--- a/src/network.c
+++ b/src/network.c
@@ -35,6 +35,7 @@
 #include "common.h"
 #include "simutil.h"
 #include "util.h"
+#include "storage.h"
 
 #define NETWORK_REGISTRATION_INTERFACE "org.ofono.NetworkRegistration"
 #define NETWORK_OPERATOR_INTERFACE "org.ofono.NetworkOperator"
@@ -54,6 +55,9 @@ enum network_registration_mode {
 /* How often we update the operator list, in seconds */
 #define OPERATOR_LIST_UPDATE_TIME 300
 
+#define SETTINGS_STORE "netreg"
+#define SETTINGS_GROUP "Settings"
+
 static GSList *g_drivers = NULL;
 
 /* 27.007 Section 7.3 <stat> */
@@ -82,6 +86,8 @@ struct ofono_netreg {
 	struct sim_eons *eons;
 	gint opscan_source;
 	struct ofono_sim *sim;
+	GKeyFile *settings;
+	char *imsi;
 	struct ofono_watchlist *status_watches;
 	const struct ofono_netreg_driver *driver;
 	void *driver_data;
@@ -176,6 +182,12 @@ static void set_registration_mode(struct ofono_netreg *netreg, int mode)
 
 	netreg->mode = mode;
 
+	if (netreg->settings) {
+		g_key_file_set_integer(netreg->settings, SETTINGS_GROUP,
+					"Mode", netreg->mode);
+		storage_sync(netreg->imsi, SETTINGS_STORE, netreg->settings);
+	}
+
 	strmode = registration_mode_to_string(mode);
 
 	conn = ofono_dbus_get_connection();
@@ -1582,6 +1594,15 @@ static void netreg_unregister(struct ofono_atom *atom)
 		netreg->base_station = NULL;
 	}
 
+	if (netreg->settings) {
+		storage_close(netreg->imsi, SETTINGS_STORE,
+				netreg->settings, TRUE);
+
+		g_free(netreg->imsi);
+		netreg->imsi = NULL;
+		netreg->settings = NULL;
+	}
+
 	g_dbus_unregister_interface(conn, path,
 					NETWORK_REGISTRATION_INTERFACE);
 	ofono_modem_remove_interface(modem, NETWORK_REGISTRATION_INTERFACE);
@@ -1652,6 +1673,33 @@ struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem,
 	return netreg;
 }
 
+static void netreg_load_settings(struct ofono_netreg *netreg)
+{
+	const char *imsi;
+	int mode;
+
+	imsi = ofono_sim_get_imsi(netreg->sim);
+
+	if (!imsi)
+		return;
+
+	netreg->settings = storage_open(imsi, SETTINGS_STORE);
+
+	if (netreg->settings == NULL)
+		return;
+
+	netreg->imsi = g_strdup(imsi);
+
+	mode = g_key_file_get_integer(netreg->settings, SETTINGS_GROUP,
+					"Mode", NULL);
+
+	if (mode >= 0 && mode <= 2)
+		netreg->mode = mode;
+
+	g_key_file_set_integer(netreg->settings, SETTINGS_GROUP,
+				"Mode", netreg->mode);
+}
+
 void ofono_netreg_register(struct ofono_netreg *netreg)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
@@ -1685,9 +1733,13 @@ void ofono_netreg_register(struct ofono_netreg *netreg)
 	sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM);
 
 	if (sim_atom) {
+		const char *imsi;
+
 		/* Assume that if sim atom exists, it is ready */
 		netreg->sim = __ofono_atom_get_data(sim_atom);
 
+		netreg_load_settings(netreg);
+
 		ofono_sim_read(netreg->sim, SIM_EFPNN_FILEID,
 				OFONO_SIM_FILE_STRUCTURE_FIXED,
 				sim_pnn_read_cb, netreg);