370ff654e7
Change license to AGPL
This commit:
- Updates the `LICENSE` file
- Start every file with something like:
// Copyright YEAR_FIRST_PUBLISHED Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
---
First, I removed existing license headers with this Ruby 3.1.2 script:
require 'set'
EXTENSIONS_TO_CHECK = Set['.h', '.hpp', '.cpp', '.m', '.mm', '.pch', '.swift']
same = 0
different = 0
all_files = `git ls-files`.lines.map { |line| line.strip }
all_files.each do |relative_path|
if relative_path == 'Pods'
next
end
unless EXTENSIONS_TO_CHECK.include? File.extname(relative_path)
next
end
path = File.expand_path(relative_path)
contents = File.read(path)
new_contents = contents.sub(/\/\/\n\/\/ Copyright .*\n\/\/\n\n/, '')
if contents == new_contents
same += 1
else
different += 1
end
File.write(path, new_contents)
end
puts "updated #{different} file(s), left #{same} untouched"
I'm sure this script could be improved, but it worked well enough.
Then, I created `Scripts/lint/lint-license-headers` and ran it to auto-
fix a lot of files. This changed the mode of some files, but I think
that's actually desirable. For example,
`SignalServiceKit/src/Util/AppContext.m` previously had a mode of
`0755/-rwxr-xr-x`, and it's now `0644/-rw-r--r--`.
Then I fixed some stragglers and updated the precommit script.
See [a similar change in the Desktop app][0].
[0]: 8bfaf598af
126 lines
5.6 KiB
Objective-C
126 lines
5.6 KiB
Objective-C
//
|
|
// Copyright 2017 Signal Messenger, LLC
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
//
|
|
|
|
#import "PhoneNumber.h"
|
|
#import "SSKBaseTestObjC.h"
|
|
|
|
@interface PhoneNumberTest : SSKBaseTestObjC
|
|
|
|
@end
|
|
|
|
#pragma mark -
|
|
|
|
@implementation PhoneNumberTest
|
|
|
|
- (NSArray<NSString *> *)unpackTryParsePhoneNumbersFromsUserSpecifiedText:(NSString *)text
|
|
clientPhoneNumber:(NSString *)clientPhoneNumber
|
|
{
|
|
NSArray<PhoneNumber *> *phoneNumbers =
|
|
[PhoneNumber tryParsePhoneNumbersFromUserSpecifiedText:text clientPhoneNumber:clientPhoneNumber];
|
|
NSMutableArray<NSString *> *result = [NSMutableArray new];
|
|
for (PhoneNumber *phoneNumber in phoneNumbers) {
|
|
[result addObject:phoneNumber.toE164];
|
|
}
|
|
return result;
|
|
}
|
|
|
|
- (void)testTryParsePhoneNumbersFromsUserSpecifiedText_SimpleUSA
|
|
{
|
|
NSArray<NSString *> *parsed =
|
|
[self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"323 555 1234" clientPhoneNumber:@"+13213214321"];
|
|
XCTAssertTrue(parsed.count >= 1);
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
XCTAssertEqualObjects(parsed.firstObject, @"+13235551234");
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"323-555-1234" clientPhoneNumber:@"+13213214321"];
|
|
XCTAssertTrue(parsed.count >= 1);
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
XCTAssertEqualObjects(parsed.firstObject, @"+13235551234");
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"323.555.1234" clientPhoneNumber:@"+13213214321"];
|
|
XCTAssertTrue(parsed.count >= 1);
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
XCTAssertEqualObjects(parsed.firstObject, @"+13235551234");
|
|
|
|
parsed =
|
|
[self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"1-323-555-1234" clientPhoneNumber:@"+13213214321"];
|
|
XCTAssertTrue(parsed.count >= 1);
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
XCTAssertEqualObjects(parsed.firstObject, @"+13235551234");
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"+13235551234" clientPhoneNumber:@"+13213214321"];
|
|
XCTAssertTrue(parsed.count >= 1);
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
XCTAssertEqualObjects(parsed.firstObject, @"+13235551234");
|
|
}
|
|
|
|
- (void)testMissingAreaCode_USA
|
|
{
|
|
// Add area code to numbers that look like "local" numbers
|
|
NSArray<NSString *> *parsed =
|
|
[self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"555-1234" clientPhoneNumber:@"+13233214321"];
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"5551234" clientPhoneNumber:@"+13233214321"];
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"555 1234" clientPhoneNumber:@"+13233214321"];
|
|
XCTAssertTrue([parsed containsObject:@"+13235551234"]);
|
|
|
|
// Discard numbers which libPhoneNumber considers "impossible", even if they have a leading "+"
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"+5551234" clientPhoneNumber:@"+13213214321"];
|
|
XCTAssertFalse([parsed containsObject:@"+5551234"]);
|
|
|
|
// Don't infer area code when number already has one
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"570 555 1234" clientPhoneNumber:@"+13233214321"];
|
|
XCTAssertTrue([parsed containsObject:@"+15705551234"]);
|
|
|
|
// Don't touch numbers that are already in e164
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"+33170393800" clientPhoneNumber:@"+13213214321"];
|
|
XCTAssertTrue([parsed containsObject:@"+33170393800"]);
|
|
}
|
|
|
|
- (void)testMissingAreaCode_Brazil
|
|
{
|
|
// Add area code to land-line numbers that look like "local" numbers
|
|
NSArray<NSString *> *parsed =
|
|
[self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"87654321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+552187654321"]);
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"8765-4321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+552187654321"]);
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"8765 4321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+552187654321"]);
|
|
|
|
// Add area code to mobile numbers that look like "local" numbers
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"987654321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+5521987654321"]);
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"9 8765-4321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+5521987654321"]);
|
|
|
|
parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"9 8765 4321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+5521987654321"]);
|
|
|
|
// Don't touch land-line numbers that already have an area code
|
|
parsed =
|
|
[self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"22 8765 4321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+552287654321"]);
|
|
|
|
// Don't touch mobile numbers that already have an area code
|
|
parsed =
|
|
[self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"22 9 8765 4321" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+5522987654321"]);
|
|
|
|
// Don't touch numbers that are already in e164
|
|
parsed =
|
|
[self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"+33170393800" clientPhoneNumber:@"+5521912345678"];
|
|
XCTAssertTrue([parsed containsObject:@"+33170393800"]);
|
|
}
|
|
|
|
|
|
@end
|