Merge lp:~tiagosh/telepathy-ofono/fix-mc-plugin-sim-labels into lp:telepathy-ofono

[Tiago Salem Herrmann]

Set account display name in gsettings if empty.

Set account display name in gsettings if empty.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/164/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

24 + sprintf(sim_name, "SIM %d", index+1);

We need to get this string translated to be consistent with what ofono-setup was doing.

review: Needs Fixing

[lp:~tiagosh/telepathy-ofono/fix-mc-plugin-sim-labels]

143. By Tiago Salem Herrmann on 2015-06-02

get translations for sim labels

144. By Tiago Salem Herrmann on 2015-06-02

add comments

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/165/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

57 + final_sim_name = sim_name;

I think you need to strdup() the string here so that when you:
62 + free(final_sim_name);

you don't free static allocated memory.

review: Needs Fixing

[lp:~tiagosh/telepathy-ofono/fix-mc-plugin-sim-labels]

145. By Tiago Salem Herrmann on 2015-06-02

use strdup so free() doesn't crash

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/166/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

[lp:~tiagosh/telepathy-ofono/fix-mc-plugin-sim-labels]

146. By Tiago Salem Herrmann on 2015-06-03

Only build on armhf, amd64 and i386

=== modified file 'debian/control'
--- debian/control	2015-05-08 20:48:08 +0000
+++ debian/control	2015-06-03 18:56:24 +0000
@@ -36,7 +36,7 @@
  real phone calls and send and receive SMSs.
 
 Package: telepathy-ofono-ril-mc-plugin
-Architecture: any
+Architecture: amd64 i386 armhf
 Depends: telepathy-ofono,
          ${misc:Depends},
          ${shlibs:Depends},

=== modified file 'mc-plugin/mcp-account-manager-ofono.c'
--- mc-plugin/mcp-account-manager-ofono.c	2015-05-19 14:32:02 +0000
+++ mc-plugin/mcp-account-manager-ofono.c	2015-06-03 18:56:24 +0000
@@ -21,8 +21,11 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libintl.h>
+#include <locale.h>
 #include <string.h>
 #include <stdio.h>
+#include <malloc.h>
 #include "mcp-account-manager-ofono.h"
 
 #define PLUGIN_NAME "ofono-account"
@@ -74,6 +77,7 @@
     int            num_modems = 0;
     int index;
 
+    setlocale(LC_ALL, "");
     self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCP_TYPE_ACCOUNT_MANAGER_OFONO,
             McpAccountManagerOfonoPrivate);
 
@@ -127,16 +131,43 @@
             if (sim_names) {
                 GVariantIter iter;
                 GVariant *value;
+                GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ss)"));
                 gchar *key;
+                int found = 0;
 
                 g_variant_iter_init (&iter, sim_names);
                 while (g_variant_iter_next (&iter, "{ss}", &key, &value)) {
+                    g_variant_builder_add(builder, "(ss)", key, value);
                     if (!strcmp(key, ril_modem)) {
                         g_hash_table_insert(account->params, g_strdup("DisplayName"), g_strdup((char *)value));
+                        found = 1;
                     }
                     g_free (key);
                     g_free (value);
                 }
+                if (!found) {
+                    char *sim_name = dgettext("telephony-service", "SIM %1");
+                    char *final_sim_name = NULL;
+                    char sim_index[10] = {0};
+                    const char *placeholder = "%1";
+                    sprintf(sim_index, "%d", index+1);
+                    const char *pos = strstr(sim_name, placeholder);
+                    if (pos) {
+                        // this is used to replace %1 by the actual index
+                        // FIXME: change telephony-service's string to %d to make everything easier
+                        final_sim_name = calloc(1, strlen(sim_name) - strlen(placeholder) + strlen(sim_index) + 1);
+                        strncpy(final_sim_name, sim_name, pos - sim_name);
+                        strcat(final_sim_name, sim_index);
+                        strcat(final_sim_name, pos + strlen(placeholder));
+                    } else {
+                        final_sim_name = strdup(sim_name);
+                    }
+                    
+                    g_hash_table_insert(account->params, g_strdup("DisplayName"), g_strdup(final_sim_name));
+                    g_settings_set_value(settings, "sim-names", g_variant_new("a(ss)", builder));
+                    free(final_sim_name);
+                }
+                g_variant_builder_unref(builder);
             }
             if (sim_names) {
                 g_variant_unref(sim_names);