diff --git a/Pods b/Pods index 06051dd2a..6f712e2f0 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 06051dd2a8aeb819363f6e77de58a038c1ad705e +Subproject commit 6f712e2f01bf9a32fb6a9736c09f06ba4e13d852 diff --git a/Signal/src/Loki/Utilities/IP2Country.swift b/Signal/src/Loki/Utilities/IP2Country.swift index 763b7deaf..8730036e5 100644 --- a/Signal/src/Loki/Utilities/IP2Country.swift +++ b/Signal/src/Loki/Utilities/IP2Country.swift @@ -1,10 +1,10 @@ -import SwiftCSV +//import SwiftCSV final class IP2Country { var countryNamesCache: [String:String] = [:] - private lazy var ipv4Table = try! CSV(name: "GeoLite2-Country-Blocks-IPv4", extension: "csv", bundle: .main, delimiter: ",", encoding: .utf8, loadColumns: true)! - private lazy var countryNamesTable = try! CSV(name: "GeoLite2-Country-Locations-English", extension: "csv", bundle: .main, delimiter: ",", encoding: .utf8, loadColumns: true)! +// private lazy var ipv4Table = try! CSV(name: "GeoLite2-Country-Blocks-IPv4", extension: "csv", bundle: .main, delimiter: ",", encoding: .utf8, loadColumns: true)! +// private lazy var countryNamesTable = try! CSV(name: "GeoLite2-Country-Locations-English", extension: "csv", bundle: .main, delimiter: ",", encoding: .utf8, loadColumns: true)! private static let workQueue = DispatchQueue(label: "IP2Country.workQueue", qos: .utility) // It's important that this is a serial queue @@ -25,22 +25,23 @@ final class IP2Country { private func cacheCountry(for ip: String) -> String { var truncatedIP = ip func getCountryInternal() -> String { - if let country = countryNamesCache[ip] { return country } - if let ipv4TableIndex = ipv4Table.namedColumns["network"]!.firstIndex(where: { $0.starts(with: truncatedIP) }) { - let countryID = ipv4Table.namedColumns["registered_country_geoname_id"]![ipv4TableIndex] - if let countryNamesTableIndex = countryNamesTable.namedColumns["geoname_id"]!.firstIndex(of: countryID) { - let country = countryNamesTable.namedColumns["country_name"]![countryNamesTableIndex] - countryNamesCache[ip] = country - return country - } - } - if truncatedIP.contains(".") && !truncatedIP.hasSuffix(".") { // The fuzziest we want to go is xxx.x - truncatedIP.removeLast() - if truncatedIP.hasSuffix(".") { truncatedIP.removeLast() } - return getCountryInternal() - } else { - return "Unknown Country" - } + return "Mars" +// if let country = countryNamesCache[ip] { return country } +// if let ipv4TableIndex = ipv4Table.namedColumns["network"]!.firstIndex(where: { $0.starts(with: truncatedIP) }) { +// let countryID = ipv4Table.namedColumns["registered_country_geoname_id"]![ipv4TableIndex] +// if let countryNamesTableIndex = countryNamesTable.namedColumns["geoname_id"]!.firstIndex(of: countryID) { +// let country = countryNamesTable.namedColumns["country_name"]![countryNamesTableIndex] +// countryNamesCache[ip] = country +// return country +// } +// } +// if truncatedIP.contains(".") && !truncatedIP.hasSuffix(".") { // The fuzziest we want to go is xxx.x +// truncatedIP.removeLast() +// if truncatedIP.hasSuffix(".") { truncatedIP.removeLast() } +// return getCountryInternal() +// } else { +// return "Unknown Country" +// } } return getCountryInternal() } diff --git a/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift index 7c826844a..b09661946 100644 --- a/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift +++ b/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift @@ -12,7 +12,7 @@ import PromiseKit /// See [the documentation](https://github.com/loki-project/session-protocol-docs/wiki/Medium-Size-Groups) for more information. @objc(LKClosedGroupsProtocol) public final class ClosedGroupsProtocol : NSObject { - public static let isSharedSenderKeysEnabled = false + public static let isSharedSenderKeysEnabled = true public static let groupSizeLimit = 10 // MARK: - Sending diff --git a/SignalServiceKit/src/Messages/OWSMessageUtils.m b/SignalServiceKit/src/Messages/OWSMessageUtils.m index a3e5e54bc..daea9cfce 100644 --- a/SignalServiceKit/src/Messages/OWSMessageUtils.m +++ b/SignalServiceKit/src/Messages/OWSMessageUtils.m @@ -75,7 +75,6 @@ NS_ASSUME_NONNULL_BEGIN [unreadMessages enumerateKeysAndObjectsInGroup:groupID usingBlock:^(NSString *collection, NSString *key, id object, NSUInteger index, BOOL *stop) { if (![object conformsToProtocol:@protocol(OWSReadTracking)]) { - OWSFailDebug(@"Unexpected object in unread messages: %@", [object class]); return; } id<OWSReadTracking> unread = (id<OWSReadTracking>)object;