Skip to content

fix(ios): Remove manual geo handling, use sentry-cocoa native support #6289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antonis wants to merge 5 commits into
base: main
Choose a base branch
from
+3 −31
Open

fix(ios): Remove manual geo handling, use sentry-cocoa native support #6289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd874d6
fix(ios): Remove manual geo handling now that sentry-cocoa supports i…
antonis Jun 15, 2026
ded04cc
chore: Add changelog entry for geo handling removal
antonis Jun 15, 2026
27c70be
Revert "chore: Add changelog entry for geo handling removal"
antonis Jun 15, 2026
3c5d1fe
chore: Revert unneeded project.pbxproj changes from pod update
antonis Jun 15, 2026
be1e855
fix(ios): Update testUserWithInvalidGeo for initWithDictionary behavior
antonis Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryUserTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,11 @@ - (void)testUserWithEmptyGeo

- (void)testUserWithInvalidGeo
{
SentryUser *expected = [[SentryUser alloc] init];
[expected setUserId:@"123"];

SentryUser *actual = [RNSentry userFrom:@{ @"id" : @"123", @"geo" : @"invalid_geo_data" }
otherUserKeys:nil];

XCTAssertTrue([actual isEqualToUser:expected]);
XCTAssertEqualObjects(actual.userId, @"123");
XCTAssertNil(actual.geo);
}

@end
28 changes: 1 addition & 27 deletions packages/core/ios/RNSentry.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#import <Sentry/SentryDebugMeta.h>
#import <Sentry/SentryEvent.h>
#import <Sentry/SentryException.h>
#import <Sentry/SentryGeo.h>
#import <Sentry/SentryUser.h>

@interface SentryUser ()
Expand Down Expand Up @@ -658,32 +657,7 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
{
// we can safely ignore userDataKeys since if original JS user was null userKeys will be null
if ([userKeys isKindOfClass:NSDictionary.class]) {
NSMutableDictionary *filteredKeys = [userKeys mutableCopy];
[filteredKeys removeObjectForKey:@"geo"];
SentryUser *userInstance = [[SentryUser alloc] initWithDictionary:filteredKeys];

id geo = [userKeys valueForKey:@"geo"];
if ([geo isKindOfClass:NSDictionary.class]) {
NSDictionary *geoDict = (NSDictionary *)geo;
SentryGeo *sentryGeo = [SentryGeo alloc];

id city = [geoDict valueForKey:@"city"];
if ([city isKindOfClass:NSString.class]) {
[sentryGeo setCity:city];
}

id countryCode = [geoDict valueForKey:@"country_code"];
if ([countryCode isKindOfClass:NSString.class]) {
[sentryGeo setCountryCode:countryCode];
}

id region = [geoDict valueForKey:@"region"];
if ([region isKindOfClass:NSString.class]) {
[sentryGeo setRegion:region];
}

[userInstance setGeo:sentryGeo];
}
SentryUser *userInstance = [[SentryUser alloc] initWithDictionary:userKeys];

if ([userDataKeys isKindOfClass:NSDictionary.class]) {
[userInstance setData:userDataKeys];
Expand Down
Loading