mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 17:05:19 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fdf28aa5bb |
@@ -1,4 +1,4 @@
|
|||||||
MARKETING_VERSION = 1.5.2
|
MARKETING_VERSION = 1.5.3
|
||||||
CURRENT_PROJECT_VERSION = 1
|
CURRENT_PROJECT_VERSION = 1
|
||||||
|
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 16.0
|
IPHONEOS_DEPLOYMENT_TARGET = 16.0
|
||||||
|
|||||||
Generated
+4
-4
@@ -561,7 +561,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.5.2;
|
MARKETING_VERSION = 1.5.3;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
||||||
PRODUCT_NAME = bitchat;
|
PRODUCT_NAME = bitchat;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
@@ -620,7 +620,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.5.2;
|
MARKETING_VERSION = 1.5.3;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
||||||
PRODUCT_NAME = bitchat;
|
PRODUCT_NAME = bitchat;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
@@ -655,7 +655,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET)";
|
MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET)";
|
||||||
MARKETING_VERSION = 1.5.2;
|
MARKETING_VERSION = 1.5.3;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
||||||
PRODUCT_NAME = bitchat;
|
PRODUCT_NAME = bitchat;
|
||||||
REGISTER_APP_GROUPS = YES;
|
REGISTER_APP_GROUPS = YES;
|
||||||
@@ -749,7 +749,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET)";
|
MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET)";
|
||||||
MARKETING_VERSION = 1.5.2;
|
MARKETING_VERSION = 1.5.3;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
|
||||||
PRODUCT_NAME = bitchat;
|
PRODUCT_NAME = bitchat;
|
||||||
REGISTER_APP_GROUPS = YES;
|
REGISTER_APP_GROUPS = YES;
|
||||||
|
|||||||
@@ -44,7 +44,11 @@ final class NetworkActivationService: ObservableObject {
|
|||||||
private let permissionProvider: () -> LocationChannelManager.PermissionState
|
private let permissionProvider: () -> LocationChannelManager.PermissionState
|
||||||
private let mutualFavoritesProvider: () -> Set<Data>
|
private let mutualFavoritesProvider: () -> Set<Data>
|
||||||
private let torController: NetworkActivationTorControlling
|
private let torController: NetworkActivationTorControlling
|
||||||
private let relayController: NetworkActivationRelayControlling
|
// Resolved lazily: NostrRelayManager.init() reads NetworkActivationService.shared
|
||||||
|
// (via its live dependencies), so capturing NostrRelayManager.shared here would
|
||||||
|
// re-enter whichever singleton's dispatch_once started first and trap at launch.
|
||||||
|
private lazy var relayController: NetworkActivationRelayControlling = relayControllerProvider()
|
||||||
|
private let relayControllerProvider: () -> NetworkActivationRelayControlling
|
||||||
private let proxyController: NetworkActivationProxyControlling
|
private let proxyController: NetworkActivationProxyControlling
|
||||||
private let notificationCenter: NotificationCenter
|
private let notificationCenter: NotificationCenter
|
||||||
|
|
||||||
@@ -55,7 +59,7 @@ final class NetworkActivationService: ObservableObject {
|
|||||||
permissionProvider = { LocationChannelManager.shared.permissionState }
|
permissionProvider = { LocationChannelManager.shared.permissionState }
|
||||||
mutualFavoritesProvider = { FavoritesPersistenceService.shared.mutualFavorites }
|
mutualFavoritesProvider = { FavoritesPersistenceService.shared.mutualFavorites }
|
||||||
torController = TorManager.shared
|
torController = TorManager.shared
|
||||||
relayController = NostrRelayManager.shared
|
relayControllerProvider = { NostrRelayManager.shared }
|
||||||
proxyController = TorURLSession.shared
|
proxyController = TorURLSession.shared
|
||||||
notificationCenter = .default
|
notificationCenter = .default
|
||||||
}
|
}
|
||||||
@@ -77,7 +81,7 @@ final class NetworkActivationService: ObservableObject {
|
|||||||
self.permissionProvider = permissionProvider
|
self.permissionProvider = permissionProvider
|
||||||
self.mutualFavoritesProvider = mutualFavoritesProvider
|
self.mutualFavoritesProvider = mutualFavoritesProvider
|
||||||
self.torController = torController
|
self.torController = torController
|
||||||
self.relayController = relayController
|
self.relayControllerProvider = { relayController }
|
||||||
self.proxyController = proxyController
|
self.proxyController = proxyController
|
||||||
self.notificationCenter = notificationCenter
|
self.notificationCenter = notificationCenter
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user