Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AEEDD18B26 for ; Thu, 22 Oct 2015 22:31:07 +0000 (UTC) Received: (qmail 31454 invoked by uid 500); 22 Oct 2015 22:31:07 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 31368 invoked by uid 500); 22 Oct 2015 22:31:07 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 31134 invoked by uid 99); 22 Oct 2015 22:31:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 22:31:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 469AEE3942; Thu, 22 Oct 2015 22:31:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: purplecabbage@apache.org To: commits@cordova.apache.org Date: Thu, 22 Oct 2015 22:31:13 -0000 Message-Id: In-Reply-To: <96e490d70c084521a54dad1ed7a4fb8f@git.apache.org> References: <96e490d70c084521a54dad1ed7a4fb8f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] cordova-plugin-device git commit: Cleanup wp8 code Cleanup wp8 code Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/7f9827d2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/7f9827d2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/7f9827d2 Branch: refs/heads/master Commit: 7f9827d2f0fccbf5cb5228cc12e5abe9afdb52a2 Parents: 2fc875c Author: Jesse MacFadyen Authored: Thu Oct 22 15:12:28 2015 -0700 Committer: Jesse MacFadyen Committed: Thu Oct 22 15:12:28 2015 -0700 ---------------------------------------------------------------------- src/wp/Device.cs | 104 ++++++++++++-------------------------------------- 1 file changed, 24 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/7f9827d2/src/wp/Device.cs ---------------------------------------------------------------------- diff --git a/src/wp/Device.cs b/src/wp/Device.cs index c54e386..76fe8cf 100644 --- a/src/wp/Device.cs +++ b/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,63 +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}\",\"isVirtual\":{6}", - this.name, - this.platform, - this.uuid, - this.version, - this.model, - this.manufacturer, - this.isVirtual ? "true" : "false"); - - res = "{" + res + "}"; - DispatchCommandResult(new PluginResult(PluginResult.Status.OK, res)); + 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 bool isVirtual + public bool IsVirtual { get { - return (Microsoft.Devices.Environment.DeviceType == DeviceType.Emulator); - } - } - - public string manufacturer - { - get - { - return DeviceStatus.DeviceManufacturer; - } - } - - public string name - { - get - { - return DeviceStatus.DeviceName; - - } - } - - public string platform - { - get - { - return Environment.OSVersion.Platform.ToString(); + return (Microsoft.Devices.Environment.DeviceType == Microsoft.Devices.DeviceType.Emulator); } } - public string uuid + public string UUID { get { @@ -130,14 +83,5 @@ namespace WPCordovaClassLib.Cordova.Commands return returnVal; } } - - public string version - { - get - { - return Environment.OSVersion.Version.ToString(); - } - } - } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org