Remove the properties related to Redphone and WebRTC support.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 59a7b02de3
commit d89d4dea8a

@ -192,17 +192,12 @@ NS_ASSUME_NONNULL_BEGIN
[SignalRecipient recipientWithTextSecureIdentifier:identifier withTransaction:transaction];
if (!recipient) {
recipient = [[SignalRecipient alloc] initWithTextSecureIdentifier:identifier
relay:nil
supportsVoice:NO
supportsWebRTC:NO];
relay:nil];
}
NSDictionary *attributes = [attributesForIdentifier objectForKey:identifier];
recipient.relay = attributes[@"relay"];
recipient.supportsVoice = [attributes[@"voice"] boolValue];
// The key for the "supports WebRTC audio/video" property is "video".
recipient.supportsWebRTC = [attributes[@"video"] boolValue];
[recipient saveWithTransaction:transaction];
}

@ -1,5 +1,6 @@
// Created by Frederic Jacobs on 17/11/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "TSYapDatabaseObject.h"
@ -8,9 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface SignalRecipient : TSYapDatabaseObject
- (instancetype)initWithTextSecureIdentifier:(NSString *)textSecureIdentifier
relay:(nullable NSString *)relay
supportsVoice:(BOOL)voiceCapable
supportsWebRTC:(BOOL)supportsWebRTC;
relay:(nullable NSString *)relay;
+ (instancetype)selfRecipient;
+ (nullable instancetype)recipientWithTextSecureIdentifier:(NSString *)textSecureIdentifier;
@ -23,9 +22,10 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, nullable) NSString *relay;
@property (nonatomic, retain) NSMutableOrderedSet *devices;
@property BOOL supportsVoice;
- (BOOL)supportsVoice;
// This property indicates support for both WebRTC audio and video calls.
@property BOOL supportsWebRTC;
- (BOOL)supportsWebRTC;
@end

@ -1,5 +1,6 @@
// Created by Frederic Jacobs on 17/11/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "SignalRecipient.h"
#import "TSStorageHeaders.h"
@ -15,8 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
- (instancetype)initWithTextSecureIdentifier:(NSString *)textSecureIdentifier
relay:(nullable NSString *)relay
supportsVoice:(BOOL)voiceCapable
supportsWebRTC:(BOOL)supportsWebRTC
{
self = [super initWithUniqueId:textSecureIdentifier];
if (!self) {
@ -25,8 +24,6 @@ NS_ASSUME_NONNULL_BEGIN
_devices = [NSMutableOrderedSet orderedSetWithObject:[NSNumber numberWithInt:1]];
_relay = [relay isEqualToString:@""] ? nil : relay;
_supportsVoice = voiceCapable;
_supportsWebRTC = supportsWebRTC;
return self;
}
@ -51,11 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
SignalRecipient *myself = [self recipientWithTextSecureIdentifier:[TSStorageManager localNumber]];
if (!myself) {
myself = [[self alloc] initWithTextSecureIdentifier:[TSStorageManager localNumber]
relay:nil
supportsVoice:YES
// This property may be inaccurate, but it's fine since this will only be
// sent to the current user's other devices, which will ignore this value.
supportsWebRTC:YES];
relay:nil];
}
return myself;
}
@ -80,6 +73,16 @@ NS_ASSUME_NONNULL_BEGIN
}
}
- (BOOL)supportsVoice
{
return YES;
}
- (BOOL)supportsWebRTC
{
return YES;
}
@end
NS_ASSUME_NONNULL_END

@ -38,10 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
// for immediate use, then ask ContactsUpdater to try to update it async.
recipient =
[[SignalRecipient alloc] initWithTextSecureIdentifier:contactId
relay:relay
supportsVoice:YES
// Default to NO; ContactsUpdater will try to update this property.
supportsWebRTC:NO];
relay:relay];
[recipient saveWithTransaction:transaction];
// Update recipient with Server record async.

Loading…
Cancel
Save