oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove analytics & Signal requests

This commit is contained in:
Niels Andriesse 2020-02-01 11:49:34 +11:00
parent b4c9f3053d
commit cbda28a9a0
8 changed files with 60 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Signal/Signal-Info.plist
View File

@ -62,26 +62,19 @@
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>amazonaws.com</key>
<key>149.56.148.124</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>api-staging.directory.signal.org</key>
<key>contentproxy.signal.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>api.directory.signal.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>imaginary.stream</key>
<dict>
@ -90,13 +83,6 @@
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>signal.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>storage.seed1.loki.network</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
@ -111,13 +97,6 @@
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>whispersystems.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<key>NSAppleMusicUsageDescription</key>

2
SignalServiceKit/src/Contacts/ContactDiscoveryService.m
View File

@ -354,6 +354,8 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re
success:(void (^)(RemoteAttestation *remoteAttestation))successHandler
failure:(void (^)(NSError *error))failureHandler
{
return; // Loki: Do nothing
ECKeyPair *keyPair = [Curve25519 generateKeyPair];
NSString *enclaveId = @"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9";

1
SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift
View File

@ -237,6 +237,7 @@ class CDSBatchOperation: OWSOperation {
}
private func makeContactDiscoveryRequest(remoteAttestation: RemoteAttestation) {
return // Loki: Do nothing
guard !isCancelled else {
Logger.info("no work to do, since we were canceled")

11
SignalServiceKit/src/Loki/Utilities/Analytics.swift
View File

@ -1,11 +0,0 @@
@objc(LKAnalytics)
public final class Analytics : NSObject {
@objc public var trackImplementation: ((String) -> Void)! // Set in AppDelegate.m
@objc public static let shared = Analytics()
@objc public func track(_ event: String) {
trackImplementation(event)
}
}

5
SignalServiceKit/src/Network/OWSSignalService.m
View File

@ -232,12 +232,9 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange =
- (AFHTTPSessionManager *)defaultCDNSessionManager
{
NSURL *baseURL = [[NSURL alloc] initWithString:textSecureCDNServerURL];
OWSAssertDebug(baseURL);
NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration;
AFHTTPSessionManager *sessionManager =
[[AFHTTPSessionManager alloc] initWithBaseURL:baseURL sessionConfiguration:sessionConf];
[[AFHTTPSessionManager alloc] initWithBaseURL:nil sessionConfiguration:sessionConf];
sessionManager.securityPolicy = [OWSHTTPSecurityPolicy sharedPolicy];

6
SignalServiceKit/src/Network/OutageDetection.swift
View File

@ -27,9 +27,9 @@ public class OutageDetection: NSObject {
}
private var shouldCheckForOutage = false {
didSet {
AssertIsOnMainThread()
ensureCheckTimer()
// Loki: Don't check for outages
// AssertIsOnMainThread()
// ensureCheckTimer()
}
}

8
SignalServiceKit/src/Util/OWSAnalytics.m
View File

@ -18,8 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
#ifdef DEBUG
// TODO: Disable analytics for debug builds.
//#define NO_SIGNAL_ANALYTICS
#define NO_SIGNAL_ANALYTICS
#endif
@ -120,6 +119,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
- (void)tryToSyncEvents
{
return; // Loki: Do nothing
dispatch_async(self.serialQueue, ^{
// Don't try to sync if:
//
@ -159,6 +159,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
- (void)sendEvent:(NSDictionary *)eventDictionary eventKey:(NSString *)eventKey isCritical:(BOOL)isCritical
{
return; // Loki: Do nothing
OWSAssertDebug(eventDictionary);
OWSAssertDebug(eventKey);
AssertOnDispatchQueue(self.serialQueue);
@ -222,6 +223,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
success:(void (^_Nonnull)(void))successBlock
failure:(void (^_Nonnull)(void))failureBlock
{
return; // Loki: Do nothing
OWSAssertDebug(eventDictionary);
OWSAssertDebug(eventKey);
AssertOnDispatchQueue(self.serialQueue);
@ -292,6 +294,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
- (void)addEvent:(NSString *)eventName severity:(OWSAnalyticsSeverity)severity properties:(NSDictionary *)properties
{
return; // Loki: Do nothing
OWSAssertDebug(eventName.length > 0);
OWSAssertDebug(properties);
@ -357,6 +360,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
location:(const char *)location
line:(int)line
{
// Loki: Do nothing
DDLogFlag logFlag;
switch (severity) {
case OWSAnalyticsSeverityInfo:

70
SignalShareExtension/Info.plist
View File

@ -23,32 +23,46 @@
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>amazonaws.com</key>
<dict>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>signal.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>whispersystems.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>149.56.148.124</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>imaginary.stream</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>storage.seed1.loki.network</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>storage.seed2.loki.network</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>contentproxy.signal.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
@ -60,8 +74,8 @@
SUBQUERY (
$extensionItem.attachments,
$attachment,
ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.data"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url"
ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.data&quot;
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.url&quot;
).@count &gt;= 1
).@count == 1
</string>