1 files changed, 26 insertions, 74 deletions

diff --git a/StoneIsland/plugins/cordova-plugin-device/src/wp/Device.cs b/StoneIsland/plugins/cordova-plugin-device/src/wp/Device.cs
index 897a35af..76fe8cf2 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-device/src/wp/Device.cs
+++ b/StoneIsland/plugins/cordova-plugin-device/src/wp/Device.cs
@@ -1,32 +1,21 @@
 /*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 */
 
-using System;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
 using Microsoft.Phone.Info;
-using System.IO.IsolatedStorage;
-using System.Windows.Resources;
+using System;
 using System.IO;
-using System.Diagnostics;
+using System.IO.IsolatedStorage;
 
 namespace WPCordovaClassLib.Cordova.Commands
 {
@@ -34,55 +23,27 @@ namespace WPCordovaClassLib.Cordova.Commands
     {
         public void getDeviceInfo(string notused)
         {
-
-            string res = String.Format("\"name\":\"{0}\",\"platform\":\"{1}\",\"uuid\":\"{2}\",\"version\":\"{3}\",\"model\":\"{4}\",\"manufacturer\":\"{5}\"",
-                                        this.name,
-                                        this.platform,
-                                        this.uuid,
-                                        this.version,
-                                        this.model,
-                                        this.manufacturer);
-
-            res = "{" + res + "}";
-            //Debug.WriteLine("Result::" + res);
-            DispatchCommandResult(new PluginResult(PluginResult.Status.OK, res));
+            string res = String.Format("\"name\":\"{0}\",\"platform\":\"{1}\",\"uuid\":\"{2}\",\"version\":\"{3}\",\"model\":\"{4}\",\"manufacturer\":\"{5}\",\"isVirtual\":{6}",
+                                        DeviceStatus.DeviceName,
+                                        Environment.OSVersion.Platform.ToString(),
+                                        UUID,
+                                        Environment.OSVersion.Version.ToString(),
+                                        DeviceStatus.DeviceName,
+                                        DeviceStatus.DeviceManufacturer,
+                                        IsVirtual ? "true" : "false");
+            DispatchCommandResult(new PluginResult(PluginResult.Status.OK, "{" + res + "}"));
         }
 
-        public string model
-        {
-            get
-            {
-                return DeviceStatus.DeviceName;
-                //return String.Format("{0},{1},{2}", DeviceStatus.DeviceManufacturer, DeviceStatus.DeviceHardwareVersion, DeviceStatus.DeviceFirmwareVersion); 
-            }
-        }
 
-        public string manufacturer
+        public bool IsVirtual
         {
-            get
+            get 
             {
-                return DeviceStatus.DeviceManufacturer;
+                return (Microsoft.Devices.Environment.DeviceType == Microsoft.Devices.DeviceType.Emulator);
             }
         }
 
-        public string name
-        {
-            get
-            {
-                return DeviceStatus.DeviceName;
-                
-            }
-        }
-
-        public string platform
-        {
-            get
-            {
-                return Environment.OSVersion.Platform.ToString();
-            }
-        }
-
-        public string uuid
+        public string UUID
         {
             get
             {
@@ -122,14 +83,5 @@ namespace WPCordovaClassLib.Cordova.Commands
                 return returnVal;
             }
         }
-
-        public string version
-        {
-            get
-            {
-                return Environment.OSVersion.Version.ToString();
-            }
-        }
-
     }
 }