oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update copy / remove some unused "unseen" tracking 

// FREEBIE
This commit is contained in:
Michael Kirk 2017-06-06 15:52:30 -04:00
parent 41a34e572b
commit 146031e4d5
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/AddToGroupViewController.m
View File

@ -73,7 +73,6 @@ NS_ASSUME_NONNULL_BEGIN
@"button title to confirm adding a recipient to a group when their safety "
@"number has recently changed")
contactsManager:helper.contactsManager
verifySeen:YES
completion:^(BOOL didConfirmIdentity) {
if (didConfirmIdentity) {
[weakSelf addToGroup:phoneNumber];
@ -125,7 +124,6 @@ NS_ASSUME_NONNULL_BEGIN
@"button title to confirm adding a recipient to a group when their safety "
@"number has recently changed")
contactsManager:helper.contactsManager
verifySeen:YES
completion:^(BOOL didConfirmIdentity) {
if (didConfirmIdentity) {
[weakSelf addToGroup:signalAccount.recipientId];

1
Signal/src/ViewControllers/ConversationView/MessagesViewController.m
View File

@ -1173,7 +1173,6 @@ typedef enum : NSUInteger {
return [SafetyNumberConfirmationAlert presentAlertIfNecessaryWithRecipientIds:self.thread.recipientIdentifiers
confirmationText:confirmationText
contactsManager:self.contactsManager
verifySeen:NO
completion:completionHandler];
}

2
Signal/src/ViewControllers/NewGroupViewController.m
View File

@ -261,7 +261,6 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
@"their safety "
@"number has recently changed")
contactsManager:contactsViewHelper.contactsManager
verifySeen:YES
completion:^(BOOL didConfirmIdentity) {
if (didConfirmIdentity) {
[weakSelf addRecipientId:recipientId];
@ -351,7 +350,6 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
@"their safety "
@"number has recently changed")
contactsManager:contactsViewHelper.contactsManager
verifySeen:YES
completion:^(BOOL didConfirmIdentity) {
if (didConfirmIdentity) {
[weakSelf addRecipientId:recipientId];

10
Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift
View File

@ -4,7 +4,6 @@
import Foundation
// TODO:
class SafetyNumberConfirmationAlert: NSObject {
let TAG = "[SafetyNumberConfirmationAlert]"
@ -17,14 +16,13 @@ class SafetyNumberConfirmationAlert: NSObject {
self.storageManager = TSStorageManager.shared()
}
public class func presentAlertIfNecessary(recipientId: String, confirmationText: String, contactsManager: OWSContactsManager, verifySeen: Bool, completion: @escaping (Bool) -> Void) -> Bool {
return self.presentAlertIfNecessary(recipientIds: [recipientId], confirmationText: confirmationText, contactsManager: contactsManager, verifySeen: verifySeen, completion: completion)
public class func presentAlertIfNecessary(recipientId: String, confirmationText: String, contactsManager: OWSContactsManager, completion: @escaping (Bool) -> Void) -> Bool {
return self.presentAlertIfNecessary(recipientIds: [recipientId], confirmationText: confirmationText, contactsManager: contactsManager, completion: completion)
}
public class func presentAlertIfNecessary(recipientIds: [String], confirmationText: String, contactsManager: OWSContactsManager, verifySeen: Bool, completion: @escaping (Bool) -> Void) -> Bool {
public class func presentAlertIfNecessary(recipientIds: [String], confirmationText: String, contactsManager: OWSContactsManager, completion: @escaping (Bool) -> Void) -> Bool {
return SafetyNumberConfirmationAlert(contactsManager: contactsManager).presentIfNecessary(recipientIds: recipientIds,
confirmationText: confirmationText,
verifySeen: verifySeen,
completion: completion)
}
@ -34,7 +32,7 @@ class SafetyNumberConfirmationAlert: NSObject {
* @returns true if an alert was shown
* false if there were no unconfirmed identities
*/
public func presentIfNecessary(recipientIds: [String], confirmationText: String, verifySeen: Bool, completion: @escaping (Bool) -> Void) -> Bool {
public func presentIfNecessary(recipientIds: [String], confirmationText: String, completion: @escaping (Bool) -> Void) -> Bool {
guard let noLongerVerifiedIdentity = noLongerVerifiedIdentity(recipientIds: recipientIds) else {
// No identities to confirm, no alert to present.

3
Signal/src/call/OutboundCallInitiator.swift
View File

@ -48,8 +48,7 @@ import Foundation
let showedAlert = SafetyNumberConfirmationAlert.presentAlertIfNecessary(recipientId: recipientId,
confirmationText: CallStrings.confirmAndCallButtonTitle,
contactsManager: self.contactsManager,
verifySeen: true) { didConfirmIdentity in
contactsManager: self.contactsManager) { didConfirmIdentity in
if didConfirmIdentity {
_ = self.initiateCall(recipientId: recipientId)
}

8
Signal/translations/en.lproj/Localizable.strings
View File

@ -1073,13 +1073,13 @@
"RETRY_BUTTON_TEXT" = "Retry";
/* button title to confirm adding a recipient to a group when their safety number has recently changed */
"SAFETY_NUMBER_CHANGED_CONFIRM_ADD_TO_GROUP_ACTION" = "Confirm and Add to Group";
"SAFETY_NUMBER_CHANGED_CONFIRM_ADD_TO_GROUP_ACTION" = "Add to Group Anyway";
/* alert button text to confirm placing an outgoing call after the recipients Safety Number has changed. */
"SAFETY_NUMBER_CHANGED_CONFIRM_CALL_ACTION" = "Confirm and Call";
/* button title to confirm calling a recipient whose safety number recently changed */
"SAFETY_NUMBER_CHANGED_CONFIRM_CALL_ACTION" = "Call Anyway";
/* button title to confirm sending to a recipient whose safety number recently changed */
"SAFETY_NUMBER_CHANGED_CONFIRM_SEND_ACTION" = "Confirm and Send";
"SAFETY_NUMBER_CHANGED_CONFIRM_SEND_ACTION" = "Send Anyway";
/* Snippet to share {{safety number}} with a friend. sent e.g. via SMS */
"SAFETY_NUMBER_SHARE_FORMAT" = "Our Signal Safety Number:\n%@";