From 0dff1897c3fcbf69c90e04a54bb78685e77593ad Mon Sep 17 00:00:00 2001 From: Peter Date: Thu, 3 May 2018 01:14:36 +0300 Subject: [PATCH] no message --- MTBackupAddressSignals.h | 2 +- MTBackupAddressSignals.m | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MTBackupAddressSignals.h b/MTBackupAddressSignals.h index 2a000cf464..1e59c9363f 100644 --- a/MTBackupAddressSignals.h +++ b/MTBackupAddressSignals.h @@ -5,6 +5,6 @@ @interface MTBackupAddressSignals : NSObject -+ (MTSignal * _Nonnull)fetchBackupIps:(bool)isTestingEnvironment currentContext:(MTContext * _Nonnull)currentContext phoneNumber:(NSString * _Nullable)phoneNumber; ++ (MTSignal * _Nonnull)fetchBackupIps:(bool)isTestingEnvironment currentContext:(MTContext * _Nonnull)currentContext additionalSource:(MTSignal * _Nullable)additionalSource phoneNumber:(NSString * _Nullable)phoneNumber; @end diff --git a/MTBackupAddressSignals.m b/MTBackupAddressSignals.m index 666af2d690..64a58ce1d8 100644 --- a/MTBackupAddressSignals.m +++ b/MTBackupAddressSignals.m @@ -200,8 +200,13 @@ }]; } -+ (MTSignal * _Nonnull)fetchBackupIps:(bool)isTestingEnvironment currentContext:(MTContext * _Nonnull)currentContext phoneNumber:(NSString * _Nullable)phoneNumber { - NSArray *signals = @[[self fetchBackupIpsAzure:isTestingEnvironment phoneNumber:phoneNumber], [self fetchBackupIpsResolveGoogle:isTestingEnvironment phoneNumber:phoneNumber]]; ++ (MTSignal * _Nonnull)fetchBackupIps:(bool)isTestingEnvironment currentContext:(MTContext * _Nonnull)currentContext additionalSource:(MTSignal * _Nullable)additionalSource phoneNumber:(NSString * _Nullable)phoneNumber { + NSMutableArray *signals = [[NSMutableArray alloc] init]; + [signals addObject:[self fetchBackupIpsAzure:isTestingEnvironment phoneNumber:phoneNumber]]; + [signals addObject:[self fetchBackupIpsResolveGoogle:isTestingEnvironment phoneNumber:phoneNumber]]; + if (additionalSource != nil) { + [signals addObject:additionalSource]; + } return [[[MTSignal mergeSignals:signals] take:1] mapToSignal:^MTSignal *(MTBackupDatacenterData *data) { if (data != nil && data.addressList.count != 0) {