minor push for bug fixes.

Close issues #77, #79, #80

Author: Yue-Hsun Lin

safeslingermessager/safeslingermessager/ContactSelectView.m

@@ -68,7 +68,6 @@ - (void)viewDidLoad {
 	_appDelegate = (AppDelegate*)[[UIApplication sharedApplication]delegate];
 
 	[self setupActionSheetButtons];
-	[self displayTitle];
 
 	[_showRecentLabel setText:NSLocalizedString(@"label_MostRecentOnly", @"Most recent only")];
 
@@ -88,6 +87,7 @@ - (void)viewDidLoad {
 											   object:nil];
 
 	_filteredContacts = [NSMutableArray new];
+    [self displayTitle];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -340,7 +340,9 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
         [_appDelegate.BackupSys PerformBackup];
 
 		[tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationTop];
-		[_delegate contactDeleted:contact];
+        if (_contactSelectionMode == ContactSelectionModeIntroduce) {
+            [_delegate contactDeleted:contact];
+        }
 
 		if (_contacts.count == 0) {
 			[self reloadTable];

safeslingermessager/safeslingermessager/IntroduceView.m

@@ -160,7 +160,7 @@ - (void)SetupContact:(ContactEntry*)SelectContact {
 
 			[User2Photo setImage:pickU2.photo.length > 0 ? [UIImage imageWithData:pickU2.photo] : [UIImage imageNamed:@"blank_contact.png"]];
 
-			NSString *buttonTitle = [NSString stringWithFormat:@"%@ %@\n%@ %@", NSLocalizedString(@"label_SendTo", @"To:"), [NSString compositeName:pickU1.firstName withLastName:pickU1.lastName], NSLocalizedString(@"label_Key", @"Key:"), [NSString ChangeGMT2Local:pickU1.keygenDate GMTFormat:DATABASE_TIMESTR LocalFormat:@"dd/MMM/yyyy"]];
+			NSString *buttonTitle = [NSString stringWithFormat:@"%@ %@\n%@ %@", NSLocalizedString(@"label_SendTo", @"To:"), [NSString compositeName:pickU2.firstName withLastName:pickU2.lastName], NSLocalizedString(@"label_Key", @"Key:"), [NSString ChangeGMT2Local:pickU2.keygenDate GMTFormat:DATABASE_TIMESTR LocalFormat:@"dd/MMM/yyyy"]];
 
             [User2Btn setTitle:buttonTitle forState:UIControlStateNormal];
             break;