rock-n-code/deep-linking-sample
rock-n-code/deep-linking-sample
1
0
Fork 0
Code Pull Requests Releases 2 Wiki Activity

Implemented the handling of location coordinates from a given URL inside the "wmf_placesActivityWithURL:" function in the NSUserActivity+WMFExtensions extension.

Browse Source
This commit is contained in:
Javier Cicchelli 2023-04-09 16:21:22 +02:00
parent 508839f64c
commit 292f63c512
2 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Apps/Wikipedia/Wikipedia/Code/NSUserActivity+WMFExtensions.m
View File

@ -62,15 +62,42 @@ __attribute__((annotate("returns_localized_nsstring"))) static inline NSString *
+ (instancetype)wmf_placesActivityWithURL:(NSURL *)activityURL { + (instancetype)wmf_placesActivityWithURL:(NSURL *)activityURL {
NSURLComponents *components = [NSURLComponents componentsWithURL:activityURL resolvingAgainstBaseURL:NO]; NSURLComponents *components = [NSURLComponents componentsWithURL:activityURL resolvingAgainstBaseURL:NO];
NSURL *articleURL = nil; NSURL *articleURL = nil;
NSNumber *latitude = nil;
NSNumber *longitude = nil;
for (NSURLQueryItem *item in components.queryItems) { for (NSURLQueryItem *item in components.queryItems) {
if ([item.name isEqualToString:@"WMFArticleURL"]) { if ([item.name isEqualToString:@"WMFArticleURL"]) {
NSString *articleURLString = item.value; NSString *articleURLString = item.value;
articleURL = [NSURL URLWithString:articleURLString]; articleURL = [NSURL URLWithString:articleURLString];
break; break;
} }
if ([item.name isEqualToString:@"coordinates"]) {
NSArray *numbers = [item.value componentsSeparatedByString:@","];
if (numbers.count == 2) {
NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
latitude = [formatter numberFromString:numbers.firstObject];
longitude = [formatter numberFromString:numbers.lastObject];
}
break;
}
} }
NSUserActivity *activity = [self wmf_pageActivityWithName:@"Places"]; NSUserActivity *activity = [self wmf_pageActivityWithName:@"Places"];
activity.webpageURL = articleURL; activity.webpageURL = articleURL;
if (latitude != nil && longitude != nil) {
NSMutableDictionary *userInfo = [activity.userInfo mutableCopy];
userInfo[@"WMFCoordinatesLatitude"] = latitude;
userInfo[@"WMFCoordinatesLongitude"] = longitude;
activity.userInfo = [userInfo copy];
}
return activity; return activity;
} }

60
Apps/Wikipedia/WikipediaUnitTests/Code/NSUserActivity+WMFExtensionsTest.m
View File

@ -44,6 +44,66 @@
XCTAssertEqual(activity.wmf_type, WMFUserActivityTypeSavedPages); XCTAssertEqual(activity.wmf_type, WMFUserActivityTypeSavedPages);
} }
- (void)testPlacesURL {
NSURL *url = [NSURL URLWithString:@"wikipedia://places"];
NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url];
XCTAssertEqual(activity.wmf_type, WMFUserActivityTypePlaces);
XCTAssertNil(activity.webpageURL);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLatitude"]);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLongitude"]);
}
- (void)testPlacesURLWithCoordinates {
NSURL *url = [NSURL URLWithString:@"wikipedia://places?coordinates=52.370216,4.895168"];
NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url];
XCTAssertEqual(activity.wmf_type, WMFUserActivityTypePlaces);
XCTAssertNil(activity.webpageURL);
XCTAssert([activity.userInfo[@"WMFCoordinatesLatitude"] isEqualToNumber:@52.370216]);
XCTAssert([activity.userInfo[@"WMFCoordinatesLongitude"] isEqualToNumber:@4.895168]);
}
- (void)testPlacesURLWithCoordinatesButNoLongitude {
NSURL *url = [NSURL URLWithString:@"wikipedia://places?coordinates=52.370216,"];
NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url];
XCTAssertEqual(activity.wmf_type, WMFUserActivityTypePlaces);
XCTAssertNil(activity.webpageURL);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLatitude"]);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLongitude"]);
}
- (void)testPlacesURLWithCoordinatesButNoLatitude {
NSURL *url = [NSURL URLWithString:@"wikipedia://places?coordinates=,4.895168"];
NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url];
XCTAssertEqual(activity.wmf_type, WMFUserActivityTypePlaces);
XCTAssertNil(activity.webpageURL);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLatitude"]);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLongitude"]);
}
- (void)testPlacesURLWithCoordinatesButNoCoordinates {
NSURL *url = [NSURL URLWithString:@"wikipedia://places?coordinates=,"];
NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url];
XCTAssertEqual(activity.wmf_type, WMFUserActivityTypePlaces);
XCTAssertNil(activity.webpageURL);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLatitude"]);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLongitude"]);
}
- (void)testPlacesURLWithCoordinatesButEmpty {
NSURL *url = [NSURL URLWithString:@"wikipedia://places?coordinates="];
NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url];
XCTAssertEqual(activity.wmf_type, WMFUserActivityTypePlaces);
XCTAssertNil(activity.webpageURL);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLatitude"]);
XCTAssertNil(activity.userInfo[@"WMFCoordinatesLongitude"]);
}
- (void)testSearchURL { - (void)testSearchURL {
NSURL *url = [NSURL URLWithString:@"wikipedia://en.wikipedia.org/w/index.php?search=dog"]; NSURL *url = [NSURL URLWithString:@"wikipedia://en.wikipedia.org/w/index.php?search=dog"];
NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url]; NSUserActivity *activity = [NSUserActivity wmf_activityForWikipediaScheme:url];