You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/05/29 18:23:32 UTC
[1/2] mac commit: [CB-2200] Remove deprecated device.name field.
Updated Branches:
refs/heads/2.8.x 8dac5a421 -> 34aaa6edb
refs/heads/master 8dac5a421 -> 2b5882335
[CB-2200] Remove deprecated device.name field.
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/2b588233
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/2b588233
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/2b588233
Branch: refs/heads/master
Commit: 2b5882335911c8658c15ffbeeb9a34a94928b475
Parents: 8dac5a4
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed May 29 11:00:39 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed May 29 11:00:39 2013 -0400
----------------------------------------------------------------------
.../CordovaFramework/Classes/Commands/CDVDevice.m | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/2b588233/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m b/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
index 2338374..0636d95 100644
--- a/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
+++ b/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
@@ -40,19 +40,6 @@
return modelVersion;
}
-- (NSString*)model
-{
- size_t size;
-
- sysctlbyname("hw.model", NULL, &size, NULL, 0);
- char* model = malloc(size);
- sysctlbyname("hw.model", model, &size, NULL, 0);
- NSString* name = [NSString stringWithUTF8String:model];
- free(model);
-
- return name;
-}
-
- (NSString*)uniqueAppInstanceIdentifier
{
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
@@ -101,7 +88,6 @@
[devProps setObject:[self platform] forKey:@"platform"];
[devProps setObject:[self systemVersion] forKey:@"version"];
[devProps setObject:[self uniqueAppInstanceIdentifier] forKey:@"uuid"];
- [devProps setObject:[self model] forKey:@"name"];
[devProps setObject:[[self class] cordovaVersion] forKey:@"cordova"];
NSDictionary* devReturn = [NSDictionary dictionaryWithDictionary:devProps];
[2/2] mac commit: [CB-2200] Remove deprecated device.name field.
(cherry picked from commit 2b5882335911c8658c15ffbeeb9a34a94928b475)
Posted by ag...@apache.org.
[CB-2200] Remove deprecated device.name field.
(cherry picked from commit 2b5882335911c8658c15ffbeeb9a34a94928b475)
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/34aaa6ed
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/34aaa6ed
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/34aaa6ed
Branch: refs/heads/2.8.x
Commit: 34aaa6edb8aba24b3bf24bc6a95db795fc674233
Parents: 8dac5a4
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed May 29 11:00:39 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed May 29 12:23:29 2013 -0400
----------------------------------------------------------------------
.../CordovaFramework/Classes/Commands/CDVDevice.m | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/34aaa6ed/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m b/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
index 2338374..0636d95 100644
--- a/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
+++ b/CordovaFramework/CordovaFramework/Classes/Commands/CDVDevice.m
@@ -40,19 +40,6 @@
return modelVersion;
}
-- (NSString*)model
-{
- size_t size;
-
- sysctlbyname("hw.model", NULL, &size, NULL, 0);
- char* model = malloc(size);
- sysctlbyname("hw.model", model, &size, NULL, 0);
- NSString* name = [NSString stringWithUTF8String:model];
- free(model);
-
- return name;
-}
-
- (NSString*)uniqueAppInstanceIdentifier
{
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
@@ -101,7 +88,6 @@
[devProps setObject:[self platform] forKey:@"platform"];
[devProps setObject:[self systemVersion] forKey:@"version"];
[devProps setObject:[self uniqueAppInstanceIdentifier] forKey:@"uuid"];
- [devProps setObject:[self model] forKey:@"name"];
[devProps setObject:[[self class] cordovaVersion] forKey:@"cordova"];
NSDictionary* devReturn = [NSDictionary dictionaryWithDictionary:devProps];