diff --git a/Configurations/Build/App Store Release/Enabled Features.xcconfig b/Configurations/Build/App Store Release/Enabled Features.xcconfig index 57c8c82d9..eb9c6f597 100644 --- a/Configurations/Build/App Store Release/Enabled Features.xcconfig +++ b/Configurations/Build/App Store Release/Enabled Features.xcconfig @@ -11,6 +11,5 @@ TEXTUAL_BUILT_INSIDE_SANDBOX=1 TEXTUAL_BUILT_WITH_ADVANCED_ENCRYPTION=1 -TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED=0 TEXTUAL_BUILT_WITH_ICLOUD_SUPPORT=1 TEXTUAL_BUILT_FOR_APP_STORE_DISTRIBUTION=1 diff --git a/Configurations/Build/Standard Release Sandboxed/Enabled Features.xcconfig b/Configurations/Build/Standard Release Sandboxed/Enabled Features.xcconfig index 2b4c76110..e5eab29fa 100644 --- a/Configurations/Build/Standard Release Sandboxed/Enabled Features.xcconfig +++ b/Configurations/Build/Standard Release Sandboxed/Enabled Features.xcconfig @@ -12,5 +12,4 @@ TEXTUAL_BUILT_INSIDE_SANDBOX=1 TEXTUAL_BUILT_WITH_ADVANCED_ENCRYPTION=1 TEXTUAL_BUILT_WITH_LICENSE_MANAGER=1 -TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED=0 TEXTUAL_BUILT_WITH_SPARKLE_ENABLED=0 diff --git a/Configurations/Build/Standard Release/Enabled Features.xcconfig b/Configurations/Build/Standard Release/Enabled Features.xcconfig index 74a6b7cdb..15a033f8a 100644 --- a/Configurations/Build/Standard Release/Enabled Features.xcconfig +++ b/Configurations/Build/Standard Release/Enabled Features.xcconfig @@ -12,5 +12,4 @@ TEXTUAL_BUILT_INSIDE_SANDBOX=0 TEXTUAL_BUILT_WITH_ADVANCED_ENCRYPTION=1 TEXTUAL_BUILT_WITH_LICENSE_MANAGER=1 -TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED=0 TEXTUAL_BUILT_WITH_SPARKLE_ENABLED=1 diff --git a/Sources/App/Build Scripts/UpdateFeatureFlags.sh b/Sources/App/Build Scripts/UpdateFeatureFlags.sh index 39b8cd588..802d65a14 100755 --- a/Sources/App/Build Scripts/UpdateFeatureFlags.sh +++ b/Sources/App/Build Scripts/UpdateFeatureFlags.sh @@ -9,7 +9,6 @@ echo " " > _FeatureFlags.h featureNames=("TEXTUAL_BUILT_INSIDE_SANDBOX" - "TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED" "TEXTUAL_BUILT_WITH_SPARKLE_ENABLED" "TEXTUAL_BUILT_WITH_LICENSE_MANAGER" "TEXTUAL_BUILT_WITH_ICLOUD_SUPPORT" diff --git a/Sources/App/Classes/Controllers/TXMasterController.m b/Sources/App/Classes/Controllers/TXMasterController.m index 5d7f2abd5..9c99233d0 100644 --- a/Sources/App/Classes/Controllers/TXMasterController.m +++ b/Sources/App/Classes/Controllers/TXMasterController.m @@ -67,11 +67,6 @@ #import "TXMasterControllerPrivate.h" #import "IRCClient.h" -#if TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED == 1 -#import -#import -#endif - #if TEXTUAL_BUILT_WITH_SPARKLE_ENABLED == 1 #import #endif @@ -234,49 +229,6 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - #pragma mark Services -- (void)prepareThirdPartyServiceAppCenterFramework -{ -#if TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED == 1 - NSDictionary *acData = [TPCResourceManager loadContentsOfPropertyListInResources:@"StaticStoreAppCenterFramework"]; - - NSString *applicationIdentifier = acData[@"Application Identifier"]; - - [MSACAppCenter start:applicationIdentifier withServices:@[[MSACCrashes class]]]; - - [MSACCrashes setUserConfirmationHandler:^BOOL(NSArray *errorReports) { - TDCAlertResponse response = - [TDCAlert modalAlertWithMessage:TXTLS(@"Prompts[oe3-i3]") - title:TXTLS(@"Prompts[h49-h5]") - defaultButton:TXTLS(@"Prompts[arr-yb]") - alternateButton:TXTLS(@"Prompts[98a-kj]") - otherButton:TXTLS(@"Prompts[6j7-hw]")]; - - switch (response) { - case TDCAlertResponseDefault: - { - [MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationSend]; - - break; - } - case TDCAlertResponseAlternate: - { - [MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationDontSend]; - - break; - } - case TDCAlertResponseOther: - { - [MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationAlways]; - - break; - } - } // switch - - return YES; - }]; -#endif -} - - (void)prepareThirdPartyServiceSparkleFramework { #if TEXTUAL_BUILT_WITH_SPARKLE_ENABLED == 1 @@ -307,8 +259,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)prepareThirdPartyServices { - [self prepareThirdPartyServiceAppCenterFramework]; - [self prepareThirdPartyServiceSparkleFramework]; } diff --git a/Sources/App/Classes/Controllers/TXMenuController.m b/Sources/App/Classes/Controllers/TXMenuController.m index d682fe019..e7f66b07f 100755 --- a/Sources/App/Classes/Controllers/TXMenuController.m +++ b/Sources/App/Classes/Controllers/TXMenuController.m @@ -3015,10 +3015,6 @@ NS_ASSUME_NONNULL_BEGIN [RZUserDefaults() setBool:NO forKey:key]; } - -#if TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED == 1 - [RZUserDefaults() removeObjectForKey:@"MSAppCenterCrashesUserConfirmation"]; -#endif } #pragma mark - diff --git a/Sources/App/Classes/Preferences/TPCPreferencesLocal.m b/Sources/App/Classes/Preferences/TPCPreferencesLocal.m index f2a8a58c1..4dc76dff7 100755 --- a/Sources/App/Classes/Preferences/TPCPreferencesLocal.m +++ b/Sources/App/Classes/Preferences/TPCPreferencesLocal.m @@ -1362,28 +1362,11 @@ TEXTUAL_IGNORE_DEPRECATION_END [dynamicDefaults setBool:TEXTUAL_RUNNING_ON_HIGHSIERRA forKey:@"System -> Running Mac OS High Sierra Or Newer"]; [dynamicDefaults setBool:TEXTUAL_RUNNING_ON_MOJAVE forKey:@"System -> Running Mac OS Mojave Or Newer"]; -#if TEXTUAL_BUILT_WITH_APPCENTER_SDK_ENABLED == 1 - [dynamicDefaults setBool:YES forKey:@"System -> 3rd-party Services -> Built with AppCenter Framework"]; -#else - [dynamicDefaults setBool:NO forKey:@"System -> 3rd-party Services -> Built with AppCenter Framework"]; -#endif - #if TEXTUAL_BUILT_WITH_SPARKLE_ENABLED == 1 [dynamicDefaults setBool:YES forKey:@"System -> 3rd-party Services -> Built with Sparkle Framework"]; #else [dynamicDefaults setBool:NO forKey:@"System -> 3rd-party Services -> Built with Sparkle Framework"]; #endif - -#if TEXTUAL_BUILT_WITH_ICLOUD_SUPPORT == 1 - [dynamicDefaults setBool:YES forKey:@"System -> Built with iCloud Support"]; -#else - [dynamicDefaults setBool:NO forKey:@"System -> Built with iCloud Support"]; -#endif - -#if TEXTUAL_BUILT_WITH_LICENSE_MANAGER == 1 - [dynamicDefaults setBool:YES forKey:@"System -> Built with License Manager Backend"]; -#else - [dynamicDefaults setBool:NO forKey:@"System -> Built with License Manager Backend"]; #endif #if TEXTUAL_BUILT_WITH_ADVANCED_ENCRYPTION == 1 diff --git a/Sources/App/Resources/Language Files/en.lproj/Prompts.strings b/Sources/App/Resources/Language Files/en.lproj/Prompts.strings index 279d3b41d..d7ea9568a 100644 --- a/Sources/App/Resources/Language Files/en.lproj/Prompts.strings +++ b/Sources/App/Resources/Language Files/en.lproj/Prompts.strings @@ -167,9 +167,3 @@ "ujw-64" = "The “Inspect Element” feature of WebKit2 cannot be accessed on this version of macOS."; "kig-m1" = "Disable WebKit2 or upgrade to a newer version of macOS."; - -"h49-h5" = "Textual quit unexpectedly last time it was open. Would you like to send an anonymous crash report?"; -"oe3-i3" = "The crash report will be sent to “App Center”, a 3rd-party service hosted by Microsoft Corporation, to be reviewed by Codeux Software.\n\nThe privacy policy for this service can be found at https://privacy.microsoft.com/en-us/PrivacyStatement"; -"arr-yb" = "Send"; -"98a-kj" = "Don't Send"; -"6j7-hw" = "Always Send"; diff --git a/Sources/App/Resources/Property Lists/StaticStoreAppCenterFramework.plist b/Sources/App/Resources/Property Lists/StaticStoreAppCenterFramework.plist deleted file mode 100644 index fbbdcce60..000000000 --- a/Sources/App/Resources/Property Lists/StaticStoreAppCenterFramework.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Application Identifier - 93d6d315-ace0-23a3-0793-e8c52a02f920 - - diff --git a/Sources/App/Textual App.xcodeproj/project.pbxproj b/Sources/App/Textual App.xcodeproj/project.pbxproj index 16345b591..7c9149041 100755 --- a/Sources/App/Textual App.xcodeproj/project.pbxproj +++ b/Sources/App/Textual App.xcodeproj/project.pbxproj @@ -21,7 +21,6 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 4C06DF1F20EC49A50055D09A /* StaticStoreAppCenterFramework.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A720EB676400448776 /* StaticStoreAppCenterFramework.plist */; }; 4C06DF2120EC49A50055D09A /* IRCCommandIndexLocalData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A020EB676400448776 /* IRCCommandIndexLocalData.plist */; }; 4C06DF2220EC49A50055D09A /* IRCCommandIndexRemoteData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C31539F20EB676400448776 /* IRCCommandIndexRemoteData.plist */; }; 4C06DF2320EC49A50055D09A /* IRCNetworks.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A220EB676400448776 /* IRCNetworks.plist */; }; @@ -29,7 +28,6 @@ 4C06DF2520EC49A50055D09A /* RegisteredUserDefaultsInContainer.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A620EB676400448776 /* RegisteredUserDefaultsInContainer.plist */; }; 4C06DF2620EC49A50055D09A /* StaticStore.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A420EB676400448776 /* StaticStore.plist */; }; 4C06DF2720EC49A50055D09A /* TemplateLineTypes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A120EB676400448776 /* TemplateLineTypes.plist */; }; - 4C06DF2820EC49A60055D09A /* StaticStoreAppCenterFramework.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A720EB676400448776 /* StaticStoreAppCenterFramework.plist */; }; 4C06DF2A20EC49A60055D09A /* IRCCommandIndexLocalData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A020EB676400448776 /* IRCCommandIndexLocalData.plist */; }; 4C06DF2B20EC49A60055D09A /* IRCCommandIndexRemoteData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C31539F20EB676400448776 /* IRCCommandIndexRemoteData.plist */; }; 4C06DF2C20EC49A60055D09A /* IRCNetworks.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A220EB676400448776 /* IRCNetworks.plist */; }; @@ -37,7 +35,6 @@ 4C06DF2E20EC49A60055D09A /* RegisteredUserDefaultsInContainer.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A620EB676400448776 /* RegisteredUserDefaultsInContainer.plist */; }; 4C06DF2F20EC49A60055D09A /* StaticStore.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A420EB676400448776 /* StaticStore.plist */; }; 4C06DF3020EC49A60055D09A /* TemplateLineTypes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A120EB676400448776 /* TemplateLineTypes.plist */; }; - 4C06DF3120EC49A60055D09A /* StaticStoreAppCenterFramework.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A720EB676400448776 /* StaticStoreAppCenterFramework.plist */; }; 4C06DF3320EC49A60055D09A /* IRCCommandIndexLocalData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A020EB676400448776 /* IRCCommandIndexLocalData.plist */; }; 4C06DF3420EC49A60055D09A /* IRCCommandIndexRemoteData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C31539F20EB676400448776 /* IRCCommandIndexRemoteData.plist */; }; 4C06DF3520EC49A60055D09A /* IRCNetworks.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A220EB676400448776 /* IRCNetworks.plist */; }; @@ -45,7 +42,6 @@ 4C06DF3720EC49A60055D09A /* RegisteredUserDefaultsInContainer.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A620EB676400448776 /* RegisteredUserDefaultsInContainer.plist */; }; 4C06DF3820EC49A60055D09A /* StaticStore.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A420EB676400448776 /* StaticStore.plist */; }; 4C06DF3920EC49A60055D09A /* TemplateLineTypes.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A120EB676400448776 /* TemplateLineTypes.plist */; }; - 4C06DF3A20EC49A70055D09A /* StaticStoreAppCenterFramework.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A720EB676400448776 /* StaticStoreAppCenterFramework.plist */; }; 4C06DF3C20EC49A70055D09A /* IRCCommandIndexLocalData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A020EB676400448776 /* IRCCommandIndexLocalData.plist */; }; 4C06DF3D20EC49A70055D09A /* IRCCommandIndexRemoteData.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C31539F20EB676400448776 /* IRCCommandIndexRemoteData.plist */; }; 4C06DF3E20EC49A70055D09A /* IRCNetworks.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C3153A220EB676400448776 /* IRCNetworks.plist */; }; @@ -3322,7 +3318,6 @@ 4C3153A420EB676400448776 /* StaticStore.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = StaticStore.plist; sourceTree = ""; }; 4C3153A520EB676400448776 /* RegisteredUserDefaults.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = RegisteredUserDefaults.plist; sourceTree = ""; }; 4C3153A620EB676400448776 /* RegisteredUserDefaultsInContainer.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = RegisteredUserDefaultsInContainer.plist; sourceTree = ""; }; - 4C3153A720EB676400448776 /* StaticStoreAppCenterFramework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = StaticStoreAppCenterFramework.plist; sourceTree = ""; }; 4C3154B720EB685700448776 /* Textual App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Textual App.xcconfig"; sourceTree = ""; }; 4C3154B820EB685700448776 /* Textual.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Textual.xcconfig; sourceTree = ""; }; 4C3154B920EB685700448776 /* Textual Extensions.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Textual Extensions.xcconfig"; sourceTree = ""; }; @@ -4749,7 +4744,6 @@ 4C3153A520EB676400448776 /* RegisteredUserDefaults.plist */, 4C3153A620EB676400448776 /* RegisteredUserDefaultsInContainer.plist */, 4C3153A420EB676400448776 /* StaticStore.plist */, - 4C3153A720EB676400448776 /* StaticStoreAppCenterFramework.plist */, 4C3153A120EB676400448776 /* TemplateLineTypes.plist */, ); path = "Property Lists"; @@ -6385,7 +6379,6 @@ 4C06E0AC20EC4A540055D09A /* FormattingColor_2.png in Resources */, 4C06E1A220EC4AC40055D09A /* TDCFileTransferDialog.xib in Resources */, 4C06E2F820EC4FF00055D09A /* TDCChannelBanListSheet.strings in Resources */, - 4C06DF1F20EC49A50055D09A /* StaticStoreAppCenterFramework.plist in Resources */, 4C06E04620EC4A100055D09A /* DIGreenBadgeCenter.png in Resources */, 4C06E34020EC4FF00055D09A /* TDCChannelModifyTopicSheet.strings in Resources */, 4C06E19620EC4AC40055D09A /* TDCServerEndpointListSheet.xib in Resources */, @@ -6492,7 +6485,6 @@ 4C06E1A820EC4AC40055D09A /* TDCServerChannelListDialog.xib in Resources */, 4C06E0C820EC4A5B0055D09A /* channelRoomStatusIconDarkActive@2x.tif in Resources */, 4C06E30620EC4FF00055D09A /* TDCChannelInviteSheet.strings in Resources */, - 4C06DF3120EC49A60055D09A /* StaticStoreAppCenterFramework.plist in Resources */, 4C06E22820EC4AC50055D09A /* TVCMainWindowAppearance.plist in Resources */, 4C06E05D20EC4A4C0055D09A /* encryptionLockIconLight.tif in Resources */, 4C06E11A20EC4A630055D09A /* TPWTB_Advanced.png in Resources */, @@ -6643,7 +6635,6 @@ 4C06E1A920EC4AC40055D09A /* TDCServerChannelListDialog.xib in Resources */, 4C06E0DA20EC4A5B0055D09A /* channelRoomStatusIconDarkActive@2x.tif in Resources */, 4C06E30720EC4FF00055D09A /* TDCChannelInviteSheet.strings in Resources */, - 4C06DF3A20EC49A70055D09A /* StaticStoreAppCenterFramework.plist in Resources */, 4C06E22920EC4AC50055D09A /* TVCMainWindowAppearance.plist in Resources */, 4C06E05920EC4A4C0055D09A /* encryptionLockIconLight.tif in Resources */, 4C06E12A20EC4A640055D09A /* TPWTB_Advanced.png in Resources */, @@ -6794,7 +6785,6 @@ 4C06E1A720EC4AC40055D09A /* TDCServerChannelListDialog.xib in Resources */, 4C06E0B620EC4A5A0055D09A /* channelRoomStatusIconDarkActive@2x.tif in Resources */, 4C06E30520EC4FF00055D09A /* TDCChannelInviteSheet.strings in Resources */, - 4C06DF2820EC49A60055D09A /* StaticStoreAppCenterFramework.plist in Resources */, 4C06E22720EC4AC50055D09A /* TVCMainWindowAppearance.plist in Resources */, 4C06E06120EC4A4C0055D09A /* encryptionLockIconLight.tif in Resources */, 4C06E10A20EC4A630055D09A /* TPWTB_Advanced.png in Resources */,