From fb3e2557e097514095a49e89ec5744b58b30d091 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 10 May 2017 10:58:26 -0400
Subject: [PATCH 1/2] Show example phone numbers.

// FREEBIE
---
 src/Contacts/PhoneNumberUtil.h |  2 ++
 src/Contacts/PhoneNumberUtil.m | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/Contacts/PhoneNumberUtil.h b/src/Contacts/PhoneNumberUtil.h
index 0d830ec43..6cd131596 100644
--- a/src/Contacts/PhoneNumberUtil.h
+++ b/src/Contacts/PhoneNumberUtil.h
@@ -22,6 +22,8 @@
                                    to:(NSString *)target
                     stickingRightward:(bool)preferHigh;
 
++ (NSString *)examplePhoneNumberForCountryCode:(NSString *)countryCode;
+
 + (instancetype)sharedUtil;
 
 @end
diff --git a/src/Contacts/PhoneNumberUtil.m b/src/Contacts/PhoneNumberUtil.m
index 9dc0df8e7..b08be77dd 100644
--- a/src/Contacts/PhoneNumberUtil.m
+++ b/src/Contacts/PhoneNumberUtil.m
@@ -244,4 +244,27 @@
     }
 }
 
++ (NSString *)examplePhoneNumberForCountryCode:(NSString *)countryCode
+{
+    NSError *error;
+    NBPhoneNumber *nbPhoneNumber =
+        [[[self sharedUtil] nbPhoneNumberUtil] getExampleNumberForType:countryCode
+                                                                  type:NBEPhoneNumberTypeMOBILE
+                                                                 error:&error];
+    OWSAssert(!error);
+    if (!nbPhoneNumber) {
+        nbPhoneNumber =
+            [[[self sharedUtil] nbPhoneNumberUtil] getExampleNumberForType:countryCode
+                                                                      type:NBEPhoneNumberTypeFIXED_LINE_OR_MOBILE
+                                                                     error:&error];
+        OWSAssert(!error);
+    }
+    NSString *result = (nbPhoneNumber ? [[[self sharedUtil] nbPhoneNumberUtil] format:nbPhoneNumber
+                                                                         numberFormat:NBEPhoneNumberFormatE164
+                                                                                error:&error]
+                                      : nil);
+    OWSAssert(!error);
+    return result;
+}
+
 @end

From 150c166a60b5bfb82aac035ff7bfc3e6cf7a5edb Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 10 May 2017 11:00:38 -0400
Subject: [PATCH 2/2] Show example phone numbers.

// FREEBIE
---
 src/Contacts/PhoneNumberUtil.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Contacts/PhoneNumberUtil.m b/src/Contacts/PhoneNumberUtil.m
index b08be77dd..bf41f8be0 100644
--- a/src/Contacts/PhoneNumberUtil.m
+++ b/src/Contacts/PhoneNumberUtil.m
@@ -246,6 +246,7 @@
 
 + (NSString *)examplePhoneNumberForCountryCode:(NSString *)countryCode
 {
+    // Signal users are very likely using mobile devices, so prefer that kind of example.
     NSError *error;
     NBPhoneNumber *nbPhoneNumber =
         [[[self sharedUtil] nbPhoneNumberUtil] getExampleNumberForType:countryCode
@@ -253,6 +254,8 @@
                                                                  error:&error];
     OWSAssert(!error);
     if (!nbPhoneNumber) {
+        // For countries that with similar mobile and land lines, use "line or mobile"
+        // examples.
         nbPhoneNumber =
             [[[self sharedUtil] nbPhoneNumberUtil] getExampleNumberForType:countryCode
                                                                       type:NBEPhoneNumberTypeFIXED_LINE_OR_MOBILE