Skip to content
Permalink
Browse files
Add isVirtual for Windows 8.x (Phone) platforms
Sets `isVirtual` to true when:
- Running in Simulator on Windows 8.x/10
- Running in Windows Phone 8.x Emulator

This also uses the `Windows.Security.ExchangeActiveSyncProvisioning.EasClientDeviceInformation` to get the manufacturer instead of querying this from the PnP devices.

Not tested with Windows 10 Mobile Emulator, but should be the same as Windows 8.1 Phone.
  • Loading branch information
pke committed Oct 27, 2015
1 parent 408c3a2 commit 05787ac65b71988b360c367521c82897f006fe40
Showing 2 changed files with 28 additions and 38 deletions.
@@ -214,6 +214,7 @@ Get the operating system version.
// iPhone: iOS 3.2 returns "3.2"
//
// Windows Phone 7: returns current OS version number, ex. on Mango returns 7.10.7720
// Windows 8: return the current OS version, ex on Windows 8.1 returns 6.3.9600.16384
// Tizen: returns "TIZEN_20120425_2"
var deviceVersion = device.version;

@@ -228,6 +229,7 @@ whether the device is running on a simulator.
- Android 2.1+
- iOS
- Windows Phone 8
- Windows 8


## device.serial
@@ -25,16 +25,13 @@ var DEVICE_CLASS_KEY_NO_SEMICOLON = '{A45C254E-DF1C-4EFD-8020-67D146A850E0}10';
var ROOT_CONTAINER_QUERY = "System.Devices.ContainerId:=\"" + ROOT_CONTAINER + "\"";
var HAL_DEVICE_CLASS = "4d36e966-e325-11ce-bfc1-08002be10318";
var DEVICE_DRIVER_VERSION_KEY = "{A8B865DD-2E3D-4094-AD97-E593A70C75D6},3";
var MANU_KEY = "System.Devices.Manufacturer";

module.exports = {

getDeviceInfo:function(win, fail, args) {

// deviceId aka uuid, stored in Windows.Storage.ApplicationData.current.localSettings.values.deviceId
var deviceId;
var manufacturer = "unknown";

// get deviceId, or create and store one
var localSettings = Windows.Storage.ApplicationData.current.localSettings;
if (localSettings.values.deviceId) {
@@ -55,51 +52,42 @@ module.exports = {


var userAgent = window.clientInformation.userAgent;
// this will report "windows" in windows8.1 and windows phone 8.1 apps
// and "windows8" in windows 8.0 apps similar to cordova.js
// See https://github.com/apache/cordova-js/blob/master/src/windows/platform.js#L25
// this will report "windows" in windows8.1 and windows phone 8.1 apps
// and "windows8" in windows 8.0 apps similar to cordova.js
// See https://github.com/apache/cordova-js/blob/master/src/windows/platform.js#L25
var devicePlatform = userAgent.indexOf("MSAppHost/1.0") == -1 ? "windows" : "windows8";
var versionString = userAgent.match(/Windows (?:Phone |NT )?([0-9.]+)/)[1];


var deviceInfo = new Windows.Security.ExchangeActiveSyncProvisioning.EasClientDeviceInformation();
// Running in the Windows Simulator is a remote session.
// Running in the Windows Phone Emulator has the systemProductName set to "Virtual"
var isVirtual = Windows.System.RemoteDesktop.InteractiveSession.isRemote || deviceInfo.systemProductName == "Virtual";
var manufacturer = deviceInfo.systemManufacturer;
var model = deviceInfo.systemProductName;

var Pnp = Windows.Devices.Enumeration.Pnp;

Pnp.PnpObject.findAllAsync(Pnp.PnpObjectType.deviceContainer,[MANU_KEY])
.then(function (infoList) {
var numDevices = infoList.length;
if (numDevices) {
for (var i = 0; i < numDevices; i++) {
var devContainer = infoList[i];
if (devContainer.id == ROOT_CONTAINER) {
manufacturer = devContainer.properties[MANU_KEY];
Pnp.PnpObject.findAllAsync(Pnp.PnpObjectType.device,
[DEVICE_DRIVER_VERSION_KEY, DEVICE_CLASS_KEY],
ROOT_CONTAINER_QUERY)
.then(function (rootDevices) {
for (var i = 0; i < rootDevices.length; i++) {
var rootDevice = rootDevices[i];
if (!rootDevice.properties) continue;
if (rootDevice.properties[DEVICE_CLASS_KEY_NO_SEMICOLON] == HAL_DEVICE_CLASS) {
versionString = rootDevice.properties[DEVICE_DRIVER_VERSION_KEY];
break;
}
}
}
})
.then(function () {
Pnp.PnpObject.findAllAsync(Pnp.PnpObjectType.device,
[DEVICE_DRIVER_VERSION_KEY, DEVICE_CLASS_KEY],
ROOT_CONTAINER_QUERY)
.then(function (rootDevices) {
for (var i = 0; i < rootDevices.length; i++) {
var rootDevice = rootDevices[i];
if (!rootDevice.properties) continue;
if (rootDevice.properties[DEVICE_CLASS_KEY_NO_SEMICOLON] == HAL_DEVICE_CLASS) {
versionString = rootDevice.properties[DEVICE_DRIVER_VERSION_KEY];
break;
}
}

setTimeout(function () {
win({ platform: devicePlatform,
version: versionString,
uuid: deviceId,
model: window.clientInformation.platform,
manufacturer:manufacturer});
}, 0);
});
setTimeout(function () {
win({ platform: devicePlatform,
version: versionString,
uuid: deviceId,
isVirtual: isVirtual,
model: model,
manufacturer:manufacturer});
}, 0);
});
}

0 comments on commit 05787ac

Please sign in to comment.