diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 76510c5ae..9fbb370b2 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1599,7 +1599,7 @@ static NSTimeInterval launchStartedAt; - (LKRSSFeed *)lokiMessengerUpdatesFeed { - return [[LKRSSFeed alloc] initWithId:@"loki.network.messenger-updates.feed" server:@"https://loki.network/category/messenger-updates/feed/" displayName:@"Loki Messenger Updates" isDeletable:false]; + return [[LKRSSFeed alloc] initWithId:@"loki.network.messenger-updates.feed" server:@"https://loki.network/category/messenger-updates/feed/" displayName:@"Session Updates" isDeletable:false]; } - (void)setUpDefaultPublicChatsIfNeeded @@ -1647,7 +1647,7 @@ static NSTimeInterval launchStartedAt; if (lokiNewsFeedThread != nil && self.lokiNewsFeedPoller == nil) { self.lokiNewsFeedPoller = [[LKRSSFeedPoller alloc] initForFeed:self.lokiNewsFeed]; } - // The user can't delete the Loki Messenger Updates RSS feed + // The user can't delete the Session Updates RSS feed if (self.lokiMessengerUpdatesFeedPoller == nil) { self.lokiMessengerUpdatesFeedPoller = [[LKRSSFeedPoller alloc] initForFeed:self.lokiMessengerUpdatesFeed]; } diff --git a/SignalMessaging/environment/VersionMigrations.m b/SignalMessaging/environment/VersionMigrations.m index c569b0173..0442a17bd 100644 --- a/SignalMessaging/environment/VersionMigrations.m +++ b/SignalMessaging/environment/VersionMigrations.m @@ -191,7 +191,7 @@ NS_ASSUME_NONNULL_BEGIN } // Update RSS feeds here LKRSSFeed *lokiNewsFeed = [[LKRSSFeed alloc] initWithId:@"loki.network.feed" server:@"https://loki.network/feed/" displayName:NSLocalizedString(@"Loki News", @"") isDeletable:true]; - LKRSSFeed *lokiMessengerUpdatesFeed = [[LKRSSFeed alloc] initWithId:@"loki.network.messenger-updates.feed" server:@"https://loki.network/category/messenger-updates/feed/" displayName:NSLocalizedString(@"Loki Messenger Updates", @"") isDeletable:false]; + LKRSSFeed *lokiMessengerUpdatesFeed = [[LKRSSFeed alloc] initWithId:@"loki.network.messenger-updates.feed" server:@"https://loki.network/category/messenger-updates/feed/" displayName:NSLocalizedString(@"Session Updates", @"") isDeletable:false]; NSArray *feeds = @[ lokiNewsFeed, lokiMessengerUpdatesFeed ]; for (LKRSSFeed *feed in feeds) { TSGroupThread *thread = [TSGroupThread threadWithGroupId:[feed.id dataUsingEncoding:NSUTF8StringEncoding] transaction:transaction]; diff --git a/SignalMessaging/utils/FullTextSearcher.swift b/SignalMessaging/utils/FullTextSearcher.swift index dabe3cc02..fa56f7ccb 100644 --- a/SignalMessaging/utils/FullTextSearcher.swift +++ b/SignalMessaging/utils/FullTextSearcher.swift @@ -364,7 +364,7 @@ public class FullTextSearcher: NSObject { @objc(filterThreads:withSearchText:) public func filterThreads(_ threads: [TSThread], searchText: String) -> [TSThread] { - let threads = threads.filter { $0.name() != "Loki Messenger Updates" && $0.name() != "Loki News" } + let threads = threads.filter { $0.name() != "Session Updates" && $0.name() != "Loki News" } guard searchText.trimmingCharacters(in: .whitespacesAndNewlines).count > 0 else { return threads } diff --git a/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift b/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift index 0b1e3cc0a..a705d6fb5 100644 --- a/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift +++ b/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift @@ -48,7 +48,7 @@ internal class LokiFileServerProxy : LokiHTTPClient { var headers = getCanonicalHeaders(for: request) return LokiAPI.getRandomSnode().then { [server = self.server, keyPair = self.keyPair, httpSession = self.httpSession] proxy -> Promise in let url = "\(proxy.address):\(proxy.port)/file_proxy" - print("[Loki] Proxying file server request to \(server) through \(proxy).") + print("[Loki] Proxying file server request through \(proxy).") guard let urlAsString = request.url?.absoluteString, let serverURLEndIndex = urlAsString.range(of: server)?.upperBound, serverURLEndIndex < urlAsString.endIndex else { throw Error.endpointParsingFailed } let endpointStartIndex = urlAsString.index(after: serverURLEndIndex)