Fall back to IMEI from environement on N9/N950/N900

sailfishos · Oct 25, 2012 · d36316d · d36316d
1 parent 77ccda8
commit d36316d
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp
@@ -173,14 +173,21 @@ QString Ssu::deviceUid(){
   QString IMEI;
   QSystemDeviceInfo devInfo;
 
-  // for all devices where we know that they have an IMEI we can't fall back other UID
-  if (deviceFamily() == "n950-n9" || deviceFamily() == "n900")
-    return devInfo.imei();
+  QString IMEIenv = getenv("imei");
+  bool ok;
 
   IMEI = devInfo.imei();
   // this might not be completely unique (or might change on reflash), but works for now
-  if (IMEI == "")
-    IMEI = devInfo.uniqueDeviceID();
+  if (IMEI == ""){
+    if (deviceFamily() == "n950-n9" || deviceFamily() == "n900"){
+      bool ok;
+      QString IMEIenv = getenv("imei");
+      IMEIenv.toLongLong(&ok, 10);
+      if (ok && (IMEIenv.length() == 16 || IMEIenv.length() == 15))
+        IMEI = IMEIenv;
+    } else
+      IMEI = devInfo.uniqueDeviceID();
+  }
   return IMEI;
 }