jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use vendorID as deviceId

Browse Source 
Summary:
Device Id needs to be the same for multiple apps on the same device. This isn't true for this attribute, which is specific to the vendor of the app.
Apple has deprecated the API that gives you the device Id, so we can't discover it in the SDK alone.

However, this isn't a problem because we have a similar issue on android, and now Flipper desktop gives each device it's own deviceId during certificate exchange.
Removing this incorrect one so it's never used as a fallback, which would cause flipper to think the app is on a different device than the one it's running on.

Reviewed By: danielbuechele

Differential Revision: D9700552

fbshipit-source-id: 5467f6cb7d1f941af9df09fc6a03dbe34e6575e5
This commit is contained in:
John Knox
2018-09-11 07:44:34 -07:00
committed by Facebook Github Bot
parent 3b6526eb07
commit 6f1e011a8b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
iOS/SonarKit/SonarClient.mm
View File

@@ -47,7 +47,6 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
UIDevice *device = [UIDevice currentDevice]; UIDevice *device = [UIDevice currentDevice];
NSString *deviceName = [device name]; NSString *deviceName = [device name];
NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleNameKey]; NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleNameKey];
NSString *deviceId = [[device identifierForVendor]UUIDString];
NSString *appId = appName; NSString *appId = appName;
NSString *privateAppDirectory = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES)[0]; NSString *privateAppDirectory = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES)[0];
@@ -67,7 +66,7 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
"localhost", "localhost",
"iOS", "iOS",
[deviceName UTF8String], [deviceName UTF8String],
[deviceId UTF8String], "unknown",
[appName UTF8String], [appName UTF8String],
[appId UTF8String], [appId UTF8String],
[privateAppDirectory UTF8String], [privateAppDirectory UTF8String],