From 6c13d46be21be782cd8f09320a29ebb619cc8a53 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 3 Nov 2017 10:49:37 -0400 Subject: [PATCH] use manually specified censorship host // FREEBIE --- SignalServiceKit/src/Network/OWSSignalService.m | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m index 1156dcd0a..b43c84b19 100644 --- a/SignalServiceKit/src/Network/OWSSignalService.m +++ b/SignalServiceKit/src/Network/OWSSignalService.m @@ -187,13 +187,18 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = // Target fronting domain OWSAssert(self.isCensorshipCircumventionActive); - NSString *frontingHost = [self.censorshipConfiguration frontingHost:localNumber]; + + NSURL *baseURL; + if (self.isCensorshipCircumventionManuallyActivated && self.manualCensorshipCircumventionDomain.length > 0) { - frontingHost = self.manualCensorshipCircumventionDomain; - }; - NSURL *baseURL = [[NSURL alloc] initWithString:[self.censorshipConfiguration frontingHost:localNumber]]; - OWSAssert(baseURL); + baseURL = [[NSURL alloc] initWithString:[NSString stringWithFormat:@"https://%@", self.manualCensorshipCircumventionDomain]]; + } + if (baseURL == nil) { + baseURL = [[NSURL alloc] initWithString:[self.censorshipConfiguration frontingHost:localNumber]]; + } + + OWSAssert(baseURL); return baseURL; }