|
|
|
@ -2,7 +2,7 @@
|
|
|
|
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
|
|
|
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
|
|
|
//
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
#import "MessageComposeTableViewController.h"
|
|
|
|
#import "NewContactThreadViewController.h"
|
|
|
|
#import "ContactTableViewCell.h"
|
|
|
|
#import "ContactTableViewCell.h"
|
|
|
|
#import "ContactsViewHelper.h"
|
|
|
|
#import "ContactsViewHelper.h"
|
|
|
|
#import "Environment.h"
|
|
|
|
#import "Environment.h"
|
|
|
|
@ -22,7 +22,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
|
|
|
|
|
|
|
@interface MessageComposeTableViewController () <UISearchBarDelegate,
|
|
|
|
@interface NewContactThreadViewController () <UISearchBarDelegate,
|
|
|
|
ContactsViewHelperDelegate,
|
|
|
|
ContactsViewHelperDelegate,
|
|
|
|
OWSTableViewControllerDelegate,
|
|
|
|
OWSTableViewControllerDelegate,
|
|
|
|
NewNonContactConversationViewControllerDelegate,
|
|
|
|
NewNonContactConversationViewControllerDelegate,
|
|
|
|
@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
|
|
|
|
|
|
|
#pragma mark -
|
|
|
|
#pragma mark -
|
|
|
|
|
|
|
|
|
|
|
|
@implementation MessageComposeTableViewController
|
|
|
|
@implementation NewContactThreadViewController
|
|
|
|
|
|
|
|
|
|
|
|
- (void)loadView
|
|
|
|
- (void)loadView
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -211,7 +211,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
return view;
|
|
|
|
return view;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)viewDidLoad {
|
|
|
|
- (void)viewDidLoad
|
|
|
|
|
|
|
|
{
|
|
|
|
[super viewDidLoad];
|
|
|
|
[super viewDidLoad];
|
|
|
|
|
|
|
|
|
|
|
|
self.title = NSLocalizedString(@"MESSAGE_COMPOSEVIEW_TITLE", @"");
|
|
|
|
self.title = NSLocalizedString(@"MESSAGE_COMPOSEVIEW_TITLE", @"");
|
|
|
|
@ -231,13 +232,15 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
[self showContactAppropriateViews];
|
|
|
|
[self showContactAppropriateViews];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)viewDidAppear:(BOOL)animated {
|
|
|
|
- (void)viewDidAppear:(BOOL)animated
|
|
|
|
|
|
|
|
{
|
|
|
|
[super viewDidAppear:animated];
|
|
|
|
[super viewDidAppear:animated];
|
|
|
|
|
|
|
|
|
|
|
|
[self showIOSUpgradeNagIfNecessary];
|
|
|
|
[self showIOSUpgradeNagIfNecessary];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)showIOSUpgradeNagIfNecessary {
|
|
|
|
- (void)showIOSUpgradeNagIfNecessary
|
|
|
|
|
|
|
|
{
|
|
|
|
// Only show the nag to iOS 8 users.
|
|
|
|
// Only show the nag to iOS 8 users.
|
|
|
|
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) {
|
|
|
|
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -253,13 +256,11 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
NSString *currentAppVersion = [AppVersion instance].currentAppVersion;
|
|
|
|
NSString *currentAppVersion = [AppVersion instance].currentAppVersion;
|
|
|
|
OWSAssert(currentAppVersion.length > 0);
|
|
|
|
OWSAssert(currentAppVersion.length > 0);
|
|
|
|
NSString *lastNagAppVersion = [Environment.preferences iOSUpgradeNagVersion];
|
|
|
|
NSString *lastNagAppVersion = [Environment.preferences iOSUpgradeNagVersion];
|
|
|
|
if (lastNagAppVersion &&
|
|
|
|
if (lastNagAppVersion && ![lastNagAppVersion isEqualToString:currentAppVersion]) {
|
|
|
|
![lastNagAppVersion isEqualToString:currentAppVersion]) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[Environment.preferences setIOSUpgradeNagVersion:currentAppVersion];
|
|
|
|
[Environment.preferences setIOSUpgradeNagVersion:currentAppVersion];
|
|
|
|
|
|
|
|
|
|
|
|
[OWSAlerts showAlertWithTitle:
|
|
|
|
[OWSAlerts showAlertWithTitle:NSLocalizedString(@"UPGRADE_IOS_ALERT_TITLE",
|
|
|
|
NSLocalizedString(@"UPGRADE_IOS_ALERT_TITLE",
|
|
|
|
|
|
|
|
@"Title for the alert indicating that user should upgrade iOS.")
|
|
|
|
@"Title for the alert indicating that user should upgrade iOS.")
|
|
|
|
message:NSLocalizedString(@"UPGRADE_IOS_ALERT_MESSAGE",
|
|
|
|
message:NSLocalizedString(@"UPGRADE_IOS_ALERT_MESSAGE",
|
|
|
|
@"Message for the alert indicating that user should upgrade iOS.")];
|
|
|
|
@"Message for the alert indicating that user should upgrade iOS.")];
|
|
|
|
@ -277,7 +278,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
__weak MessageComposeTableViewController *weakSelf = self;
|
|
|
|
__weak NewContactThreadViewController *weakSelf = self;
|
|
|
|
ContactsViewHelper *helper = self.contactsViewHelper;
|
|
|
|
ContactsViewHelper *helper = self.contactsViewHelper;
|
|
|
|
|
|
|
|
|
|
|
|
OWSTableSection *section = [OWSTableSection new];
|
|
|
|
OWSTableSection *section = [OWSTableSection new];
|
|
|
|
@ -461,8 +462,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
- (void)showContactAppropriateViews
|
|
|
|
- (void)showContactAppropriateViews
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (self.contactsViewHelper.contactsManager.isSystemContactsAuthorized) {
|
|
|
|
if (self.contactsViewHelper.contactsManager.isSystemContactsAuthorized) {
|
|
|
|
if (self.contactsViewHelper.hasUpdatedContactsAtLeastOnce
|
|
|
|
if (self.contactsViewHelper.hasUpdatedContactsAtLeastOnce && self.contactsViewHelper.signalAccounts.count < 1
|
|
|
|
&& self.contactsViewHelper.signalAccounts.count < 1
|
|
|
|
|
|
|
|
&& ![[Environment preferences] hasDeclinedNoContactsView]) {
|
|
|
|
&& ![[Environment preferences] hasDeclinedNoContactsView]) {
|
|
|
|
self.isNoContactsModeActive = YES;
|
|
|
|
self.isNoContactsModeActive = YES;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
@ -502,12 +502,12 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
|
|
|
|
|
|
|
#pragma mark - Send Invite By SMS
|
|
|
|
#pragma mark - Send Invite By SMS
|
|
|
|
|
|
|
|
|
|
|
|
- (void)sendTextToPhoneNumber:(NSString *)phoneNumber {
|
|
|
|
- (void)sendTextToPhoneNumber:(NSString *)phoneNumber
|
|
|
|
|
|
|
|
{
|
|
|
|
OWSAssert([phoneNumber length] > 0);
|
|
|
|
OWSAssert([phoneNumber length] > 0);
|
|
|
|
NSString *confirmMessage = NSLocalizedString(@"SEND_SMS_CONFIRM_TITLE", @"");
|
|
|
|
NSString *confirmMessage = NSLocalizedString(@"SEND_SMS_CONFIRM_TITLE", @"");
|
|
|
|
if ([phoneNumber length] > 0) {
|
|
|
|
if ([phoneNumber length] > 0) {
|
|
|
|
confirmMessage = [[NSLocalizedString(@"SEND_SMS_INVITE_TITLE", @"")
|
|
|
|
confirmMessage = [[NSLocalizedString(@"SEND_SMS_INVITE_TITLE", @"") stringByAppendingString:phoneNumber]
|
|
|
|
stringByAppendingString:phoneNumber]
|
|
|
|
|
|
|
|
stringByAppendingString:NSLocalizedString(@"QUESTIONMARK_PUNCTUATION", @"")];
|
|
|
|
stringByAppendingString:NSLocalizedString(@"QUESTIONMARK_PUNCTUATION", @"")];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -543,10 +543,13 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
[alertController addAction:okAction];
|
|
|
|
[alertController addAction:okAction];
|
|
|
|
self.searchBar.text = @"";
|
|
|
|
self.searchBar.text = @"";
|
|
|
|
|
|
|
|
|
|
|
|
//must dismiss search controller before presenting alert.
|
|
|
|
// must dismiss search controller before presenting alert.
|
|
|
|
if ([self presentedViewController]) {
|
|
|
|
if ([self presentedViewController]) {
|
|
|
|
[self dismissViewControllerAnimated:YES completion:^{
|
|
|
|
[self dismissViewControllerAnimated:YES
|
|
|
|
[self presentViewController:alertController animated:YES completion:[UIUtil modalCompletionBlock]];
|
|
|
|
completion:^{
|
|
|
|
|
|
|
|
[self presentViewController:alertController
|
|
|
|
|
|
|
|
animated:YES
|
|
|
|
|
|
|
|
completion:[UIUtil modalCompletionBlock]];
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
[self presentViewController:alertController animated:YES completion:[UIUtil modalCompletionBlock]];
|
|
|
|
[self presentViewController:alertController animated:YES completion:[UIUtil modalCompletionBlock]];
|
|
|
|
@ -557,7 +560,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
|
|
|
|
|
|
|
// called on completion of message screen
|
|
|
|
// called on completion of message screen
|
|
|
|
- (void)messageComposeViewController:(MFMessageComposeViewController *)controller
|
|
|
|
- (void)messageComposeViewController:(MFMessageComposeViewController *)controller
|
|
|
|
didFinishWithResult:(MessageComposeResult)result {
|
|
|
|
didFinishWithResult:(MessageComposeResult)result
|
|
|
|
|
|
|
|
{
|
|
|
|
switch (result) {
|
|
|
|
switch (result) {
|
|
|
|
case MessageComposeResultCancelled:
|
|
|
|
case MessageComposeResultCancelled:
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
@ -576,8 +580,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
completion:^{
|
|
|
|
completion:^{
|
|
|
|
DDLogDebug(@"view controller dismissed");
|
|
|
|
DDLogDebug(@"view controller dismissed");
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
UIAlertView *successAlert =
|
|
|
|
UIAlertView *successAlert = [[UIAlertView alloc]
|
|
|
|
[[UIAlertView alloc] initWithTitle:@""
|
|
|
|
initWithTitle:@""
|
|
|
|
message:NSLocalizedString(@"SEND_INVITE_SUCCESS", @"Alert body after invite succeeded")
|
|
|
|
message:NSLocalizedString(@"SEND_INVITE_SUCCESS", @"Alert body after invite succeeded")
|
|
|
|
delegate:nil
|
|
|
|
delegate:nil
|
|
|
|
cancelButtonTitle:NSLocalizedString(@"OK", @"")
|
|
|
|
cancelButtonTitle:NSLocalizedString(@"OK", @"")
|
|
|
|
@ -760,7 +764,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
__weak MessageComposeTableViewController *weakSelf = self;
|
|
|
|
__weak NewContactThreadViewController *weakSelf = self;
|
|
|
|
[[ContactsUpdater sharedUpdater] lookupIdentifiers:unknownPhoneNumbers
|
|
|
|
[[ContactsUpdater sharedUpdater] lookupIdentifiers:unknownPhoneNumbers
|
|
|
|
success:^(NSArray<SignalRecipient *> *recipients) {
|
|
|
|
success:^(NSArray<SignalRecipient *> *recipients) {
|
|
|
|
[weakSelf updateNonContactAccountSet:recipients];
|
|
|
|
[weakSelf updateNonContactAccountSet:recipients];
|
Matthew Chen
8 years ago