correct expected format for dual SIM (bug 948222)

mozilla · Dec 17, 2013 · ae82566 · ae82566
1 parent da1d0be
commit ae82566
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 53 deletions.
diff --git a/hearth/media/js/mobilenetwork.js b/hearth/media/js/mobilenetwork.js
@@ -310,37 +310,21 @@ define('mobilenetwork',
             var conn;
             if (conn = navigator.mozMobileConnections) {
                 consoleTagged.log('navigator.mozMobileConnections available');
-                /*
-                    Example format:
-
-                    [
-                        {
-                            data: {
-                                network: {mcc: '260', mnc: '02'}
-                            }
-                        },
-                        {
-                            data: {
-                                network: {mcc: '734', mnc: '04'}
-                            }
-                        }
-                    ]
-
-                */
-
                 if (mccs.length) {
                     consoleTagged.log('Using hardcoded MCCs:', JSON.stringify(mccs));
                 } else {
                     // If we haven't hardcoded a MCC...
                     mccs = [];
                     var connData;
+                    var network;
                     for (i = 0; i < conn.length; i++) {
-                        console.log('navigator.mozMobileConnections[' + i + ']:', conn[i]);
-                        connData = conn[i].data;
-                        if (connData && connData.network) {
-                            mccs.push({mcc: connData.network.mcc,
-                                       mnc: connData.network.mnc});
-                        }
+                        connData = conn[i];
+                        network = (connData.lastKnownHomeNetwork || connData.lastKnownNetwork || '-').split('-');
+                        consoleTagged.log('navigator.mozMobileConnections[' + i + '].lastKnownNetwork:',
+                                          connData.lastKnownNetwork);
+                        consoleTagged.log('navigator.mozMobileConnections[' + i + '].lastKnownHomeNetwork:',
+                                          conn.lastKnownHomeNetwork);
+                        mccs.push({mcc: connData[0], mnc: connData[1]});
                     }
                     consoleTagged.log('Using SIM MCCs:', JSON.stringify(mccs));
                 }

diff --git a/yulelog/main.js b/yulelog/main.js
@@ -42,38 +42,17 @@
             var conn = navigator.mozMobileConnections;
             if (conn) {
                 log('navigator.mozMobileConnections available');
-                /*
-                    Example format:
-
-                    [
-                        {
-                            data: {
-                                network: {
-                                    mcc: '260',
-                                    mnc: '02'
-                                }
-                            }
-                        },
-                        {
-                            data: {
-                                network: {
-                                    mcc: '734',
-                                    mnc: '04'
-                                }
-                            }
-                        }
-                    ]
-
-                */
                 var mccs = [];
                 var connData;
+                var network;
                 for (var i = 0; i < conn.length; i++) {
-                    log('navigator.mozMobileConnections[' + i + ']:', conn[i]);
-                    connData = conn[i].data;
-                    if (connData && connData.network) {
-                        mccs.push({mcc: connData.network.mcc,
-                                   mnc: connData.network.mnc});
-                    }
+                    connData = conn[i];
+                    network = (connData.lastKnownHomeNetwork || connData.lastKnownNetwork || '-').split('-');
+                    log('navigator.mozMobileConnections[' + i + '].lastKnownNetwork:',
+                        connData.lastKnownNetwork);
+                    log('navigator.mozMobileConnections[' + i + '].lastKnownHomeNetwork:',
+                        conn.lastKnownHomeNetwork);
+                    mccs.push({mcc: connData[0], mnc: connData[1]});
                 }
                 mccs = JSON.stringify(mccs);
                 qs = '?mccs=' + mccs;