Merge branch 'mkirk/upload-uuid-capabilities'

This commit is contained in:
Michael Kirk 2019-10-03 15:39:46 -04:00
commit 2a464f8e7a
3 changed files with 18 additions and 0 deletions

View File

@ -397,6 +397,10 @@ NS_ASSUME_NONNULL_BEGIN
accountAttributes[@"pin"] = pin;
}
if (SSKFeatureFlags.uuidCapabilities) {
accountAttributes[@"capabilities"] = @{ @"uuid" : @(YES) };
}
return [accountAttributes copy];
}

View File

@ -20,6 +20,7 @@ public class SignalServiceProfile: NSObject {
public let avatarUrlPath: String?
public let unidentifiedAccessVerifier: Data?
public let hasUnrestrictedUnidentifiedAccess: Bool
public let supportsUUID: Bool
public init(address: SignalServiceAddress?, responseObject: Any?) throws {
guard let params = ParamParser(responseObject: responseObject) else {
@ -59,5 +60,15 @@ public class SignalServiceProfile: NSObject {
self.unidentifiedAccessVerifier = try params.optionalBase64EncodedData(key: "unidentifiedAccess")
self.hasUnrestrictedUnidentifiedAccess = try params.optional(key: "unrestrictedUnidentifiedAccess") ?? false
if FeatureFlags.uuidCapabilities {
guard let capabilities = ParamParser(responseObject: try params.required(key: "capabilities")) else {
owsFailDebug("invalid capabilities")
throw ValidationError.invalid(description: "invalid capabilities: \(String(describing: params))")
}
self.supportsUUID = try capabilities.required(key: "uuid")
} else {
self.supportsUUID = false
}
}
}

View File

@ -106,6 +106,9 @@ public class FeatureFlags: NSObject {
@objc
public static let preserveYdb = true
@objc
public static let uuidCapabilities = !IsUsingProductionService()
@objc
public static var audibleErrorLogging = build.includes(.internalPreview)