~handlerug/TelegramSwift

7e6d315dbe497037f69ac5c9aa4ec3152ba4e6b9 — handlerug 3 years ago 975326a
Change bundle ID and update sources
M Telegram-Mac/Alpha.xcconfig => Telegram-Mac/Alpha.xcconfig +1 -1
@@ 10,7 10,7 @@
// https://help.apple.com/xcode/#/dev745c5c974


DSA_PEM_FILE = dsa_pub.pem
ED_KEY = vYZyxW7k5cRGzvQLZHTYw5mYIc3ToyJ3quL8XBvxm04=

SIMPLE_SLASH=/


M Telegram-Mac/AppUpdateViewController.swift => Telegram-Mac/AppUpdateViewController.swift +4 -4
@@ 89,7 89,7 @@ func updateApplication(sharedContext: SharedAccountContext) {
    let state = stateValue.with {$0.loadingState}
    switch state {
    case let .readyToInstall(item):
        var text: String = "Telegram was updated to \(item.versionTitle.lowercased())"
        var text: String = "Telegramm was updated to \(item.versionTitle.lowercased())"
        text += "\n\n"
        
        text += item.updateText


@@ 258,7 258,7 @@ func AppUpdateViewController() -> InputDataController {
    
}

private let updates_channel_xml = "macos_stable_updates_xml"
private let updates_channel_xml = "macos_telegramm_stable_updates_xml"





@@ 277,7 277,7 @@ private final class InternalUpdaterDownloader : SPUDownloaderSession {
    }
    
    override func suggestedFilename() -> String! {
        return "Telegram.app.zip"
        return "Telegramm.app.zip"
    }
    
    


@@ 374,7 374,7 @@ private final class InternalUpdateDriver : ExternalUpdateDriver {
    override func downloadUpdate() {
        let downloader = InternalUpdaterDownloader(context: self.context, updateItem: self.updateItem, delegate: self)
        self.download = downloader
        let fileName = "Telegram \(self.updateItem.versionString ?? "")"
        let fileName = "Telegramm \(self.updateItem.versionString ?? "")"

        downloader.startPersistentDownload(with: SPUURLRequest(), bundleIdentifier: host.bundle.bundleIdentifier!, desiredFilename: fileName)
    }

M Telegram-Mac/CallBridge.mm => Telegram-Mac/CallBridge.mm +1 -1
@@ 200,7 200,7 @@ static void controllerStateCallback(tgvoip::VoIPController *controller, int stat
    config.enableNS = true;
    config.enableAGC = true;
    
    config.logFilePath = [[@"~/Library/Group Containers/6N38VWS5BX.ru.keepcoder.Telegram/voip.log" stringByExpandingTildeInPath] UTF8String];
    config.logFilePath = [[@"~/Library/Group Containers/me.handlerug.Telegram/voip.log" stringByExpandingTildeInPath] UTF8String];
    
  //  strncpy(config.logFilePath, [[@"~/Library/Group Containers/6N38VWS5BX.ru.keepcoder.Telegram/voip.log" stringByExpandingTildeInPath] UTF8String], sizeof(config.logFilePath));    //memset(config.logFilePath, 0, sizeof(config.logFilePath));
    

M Telegram-Mac/Info.plist => Telegram-Mac/Info.plist +3 -3
@@ 36,7 36,7 @@
		</dict>
	</array>
	<key>CFBundleVersion</key>
	<string>193258</string>
	<string>1</string>
	<key>LSApplicationCategoryType</key>
	<string>public.app-category.social-networking</string>
	<key>LSFileQuarantineEnabled</key>


@@ 62,8 62,8 @@
	<string>NSApplication</string>
	<key>SUFeedURL</key>
	<string>${SFEED_URL}</string>
	<key>SUPublicDSAKeyFile</key>
	<string>${DSA_PEM_FILE}</string>
	<key>SUPublicEDKey</key>
	<string>${ED_KEY}</string>
	<key>UIAppFonts</key>
	<array>
		<string>SFCompactRounded-Semibold.otf</string>

M Telegram-Mac/Telegram-Mac.entitlements => Telegram-Mac/Telegram-Mac.entitlements +2 -2
@@ 6,8 6,8 @@
	<false/>
	<key>com.apple.security.application-groups</key>
	<array>
		<string>6N38VWS5BX.ru.keepcoder.Telegram</string>
		<string>6N38VWS5BX.ru.keepcoder.Telegram.TelegramShare</string>
		<string>me.handlerug.Telegram</string>
		<string>me.handlerug.Telegram.TelegramShare</string>
	</array>
	<key>com.apple.security.device.audio-input</key>
	<true/>

M Telegram-Mac/Telegram-Sandbox.entitlements => Telegram-Mac/Telegram-Sandbox.entitlements +4 -4
@@ 8,8 8,8 @@
	<true/>
	<key>com.apple.security.application-groups</key>
	<array>
		<string>6N38VWS5BX.ru.keepcoder.Telegram</string>
		<string>6N38VWS5BX.ru.keepcoder.Telegram.TelegramShare</string>
		<string>me.handlerug.Telegram</string>
		<string>me.handlerug.Telegram.TelegramShare</string>
	</array>
	<key>com.apple.security.device.audio-input</key>
	<true/>


@@ 29,8 29,8 @@
	<true/>
	<key>keychain-access-groups</key>
	<array>
		<string>6N38VWS5BX.ru.keepcoder.Telegram</string>
		<string>6N38VWS5BX.ru.keepcoder.TelegramShare</string>
		<string>$(AppIdentifierPrefix)me.handlerug.Telegram</string>
		<string>$(AppIdentifierPrefix)me.handlerug.Telegram.TelegramShare</string>
	</array>
</dict>
</plist>

M Telegram.xcodeproj/project.pbxproj => Telegram.xcodeproj/project.pbxproj +23 -25
@@ 4808,7 4808,6 @@
				TargetAttributes = {
					C232EA901E1D07E700C4D38C = {
						CreatedOnToolsVersion = 8.2;
						DevelopmentTeam = 6N38VWS5BX;
						ProvisioningStyle = Automatic;
						SystemCapabilities = {
							com.apple.ApplicationGroups.Mac = {


@@ 4821,7 4820,6 @@
					};
					D098C7141D7E175A007784E4 = {
						CreatedOnToolsVersion = 8.0;
						DevelopmentTeam = 6N38VWS5BX;
						LastSwiftMigration = 0800;
						ProvisioningStyle = Automatic;
						SystemCapabilities = {


@@ 5930,7 5928,7 @@
				OTHER_CODE_SIGN_FLAGS = "--deep";
				OTHER_LDFLAGS = "-ObjC";
				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies -D GITHUB";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;


@@ 5949,7 5947,7 @@
				CODE_SIGN_ENTITLEMENTS = TelegramShare/TelegramShare.entitlements;
				CODE_SIGN_IDENTITY = "";
				COMBINE_HIDPI_IMAGES = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",


@@ 5963,7 5961,7 @@
				MACOSX_DEPLOYMENT_TARGET = 10.11;
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_SWIFT_FLAGS = "-D DEBUG";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram.TelegramShare;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram.TelegramShare;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SKIP_INSTALL = NO;


@@ 6035,7 6033,7 @@
				CODE_SIGN_STYLE = Automatic;
				COMBINE_HIDPI_IMAGES = YES;
				DEAD_CODE_STRIPPING = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_BITCODE = NO;
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (


@@ 6075,7 6073,7 @@
				OTHER_CODE_SIGN_FLAGS = "--deep";
				OTHER_LDFLAGS = "-ObjC";
				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies -D APP_STORE";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = off;


@@ 6092,7 6090,7 @@
				CODE_SIGN_ENTITLEMENTS = TelegramShare/TelegramShare.entitlements;
				CODE_SIGN_IDENTITY = "";
				COMBINE_HIDPI_IMAGES = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",


@@ 6110,7 6108,7 @@
				MACOSX_DEPLOYMENT_TARGET = 10.11;
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_SWIFT_FLAGS = "-D BETA";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram.TelegramShare;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram.TelegramShare;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE = "";
				PROVISIONING_PROFILE_SPECIFIER = "";


@@ 6128,7 6126,7 @@
				CODE_SIGN_ENTITLEMENTS = TelegramShare/TelegramShare.entitlements;
				CODE_SIGN_IDENTITY = "Mac Developer";
				COMBINE_HIDPI_IMAGES = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",


@@ 6142,7 6140,7 @@
				MACOSX_DEPLOYMENT_TARGET = 10.11;
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_SWIFT_FLAGS = "-D DEBUG";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram.TelegramShare;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram.TelegramShare;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SKIP_INSTALL = NO;


@@ 6159,7 6157,7 @@
				CODE_SIGN_ENTITLEMENTS = TelegramShare/TelegramShare.entitlements;
				CODE_SIGN_IDENTITY = "";
				COMBINE_HIDPI_IMAGES = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",


@@ 6173,7 6171,7 @@
				MACOSX_DEPLOYMENT_TARGET = 10.11;
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_SWIFT_FLAGS = "-D APP_STORE";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram.TelegramShare;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram.TelegramShare;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SKIP_INSTALL = NO;


@@ 6244,7 6242,7 @@
				CODE_SIGN_STYLE = Automatic;
				COMBINE_HIDPI_IMAGES = YES;
				DEAD_CODE_STRIPPING = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_BITCODE = NO;
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (


@@ 6284,7 6282,7 @@
				OTHER_CODE_SIGN_FLAGS = "--deep";
				OTHER_LDFLAGS = "-ObjC";
				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies -D STABLE";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = off;


@@ 6301,7 6299,7 @@
				CODE_SIGN_ENTITLEMENTS = TelegramShare/TelegramShare.entitlements;
				CODE_SIGN_IDENTITY = "";
				COMBINE_HIDPI_IMAGES = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",


@@ 6314,7 6312,7 @@
				MACOSX_DEPLOYMENT_TARGET = 10.11;
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_SWIFT_FLAGS = "-D STABLE";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram.TelegramShare;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram.TelegramShare;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SKIP_INSTALL = NO;


@@ 6394,7 6392,7 @@
				COMBINE_HIDPI_IMAGES = YES;
				DEAD_CODE_STRIPPING = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_BITCODE = NO;
				ENABLE_HARDENED_RUNTIME = YES;
				ENABLE_NS_ASSERTIONS = NO;


@@ 6436,7 6434,7 @@
				OTHER_CODE_SIGN_FLAGS = "--deep";
				OTHER_LDFLAGS = "-ObjC";
				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies -D ALPHA";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";


@@ 6454,7 6452,7 @@
				CODE_SIGN_ENTITLEMENTS = TelegramShare/TelegramShare.entitlements;
				CODE_SIGN_IDENTITY = "";
				COMBINE_HIDPI_IMAGES = YES;
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",


@@ 6472,7 6470,7 @@
				MACOSX_DEPLOYMENT_TARGET = 10.11;
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_SWIFT_FLAGS = "-D ALPHA";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram.TelegramShare;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram.TelegramShare;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE = "";
				PROVISIONING_PROFILE_SPECIFIER = "";


@@ 6597,7 6595,7 @@
				COMBINE_HIDPI_IMAGES = YES;
				DEAD_CODE_STRIPPING = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_BITCODE = NO;
				ENABLE_HARDENED_RUNTIME = YES;
				ENABLE_NS_ASSERTIONS = NO;


@@ 6639,7 6637,7 @@
				OTHER_CODE_SIGN_FLAGS = "--deep";
				OTHER_LDFLAGS = "-ObjC";
				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies -D BETA";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";


@@ 6670,7 6668,7 @@
				COMBINE_HIDPI_IMAGES = YES;
				DEAD_CODE_STRIPPING = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DEVELOPMENT_TEAM = 6N38VWS5BX;
				DEVELOPMENT_TEAM = "";
				ENABLE_BITCODE = NO;
				ENABLE_HARDENED_RUNTIME = YES;
				FRAMEWORK_SEARCH_PATHS = (


@@ 6711,7 6709,7 @@
				OTHER_CODE_SIGN_FLAGS = "--deep";
				OTHER_LDFLAGS = "-ObjC";
				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies -D DEBUG";
				PRODUCT_BUNDLE_IDENTIFIER = ru.keepcoder.Telegram;
				PRODUCT_BUNDLE_IDENTIFIER = me.handlerug.Telegram;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE_SPECIFIER = "";
				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;

M TelegramShare/Info.plist => TelegramShare/Info.plist +1 -1
@@ 21,7 21,7 @@
	<key>CFBundleShortVersionString</key>
	<string>5.9.3</string>
	<key>CFBundleVersion</key>
	<string>193258</string>
	<string>1</string>
	<key>LSMinimumSystemVersion</key>
	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
	<key>NSExtension</key>

M TelegramShare/TelegramShare.entitlements => TelegramShare/TelegramShare.entitlements +2 -2
@@ 6,8 6,8 @@
	<true/>
	<key>com.apple.security.application-groups</key>
	<array>
		<string>6N38VWS5BX.ru.keepcoder.Telegram.TelegramShare</string>
		<string>6N38VWS5BX.ru.keepcoder.Telegram</string>
		<string>me.handlerug.Telegram</string>
		<string>me.handlerug.Telegram.TelegramShare</string>
	</array>
	<key>com.apple.security.files.user-selected.read-only</key>
	<true/>

M submodules/telegram-ios => submodules/telegram-ios +1 -1
@@ 1,1 1,1 @@
Subproject commit 46ea78b6c336a975385e9b53d047d632ac356364
Subproject commit 5d505ff41acebc4297055445337d2948612b64cc

M thrid-party/objc/sskeychain/SSKeychain.m => thrid-party/objc/sskeychain/SSKeychain.m +1 -1
@@ 115,7 115,7 @@ CFTypeRef SSKeychainAccessibilityType = NULL;
#if __has_feature(objc_arc)
	[query setObject:(__bridge id)kCFBooleanTrue forKey:(__bridge id)kSecReturnData];
	[query setObject:(__bridge id)kSecMatchLimitOne forKey:(__bridge id)kSecMatchLimit];
    [query setObject:@"6N38VWS5BX.ru.keepcoder.Telegram" forKey:kSecAttrAccessGroup];
    [query setObject:@"me.handlerug.Telegram" forKey:kSecAttrAccessGroup];
	status = SecItemCopyMatching((__bridge CFDictionaryRef)query, &result);

#else