Update submodules

.buckconfig

@@ -1,14 +1,14 @@
 [cxx]
-  default_platform = iphonesimulator-x86_64
+  default_platform = iphoneos-armv7
   cflags = -g -fmodules -fobjc-arc -D BUCK -D DEBUG -w $(config custom.other_cflags)
-  cxxflags = -fobjc-arc -std=c++14 -D BUCK -D DEBUG -g $(config custom.other_cxxflags)
+  cxxflags = -fobjc-arc -std=c++14 -D BUCK -D DEBUG -g -w $(config custom.other_cxxflags)
   combined_preprocess_and_compile = true
   pch_enabled = false
   ldflags = -Xlinker -objc_abi_version -Xlinker 2 -fobjc-arc -fobjc-link-runtime $(config custom.other_cxxflags)
 
 [swift]
   version = 4.0
-  compiler_flags = -DBUCK -enable-testing -enable-batch-mode -g -Onone $(config custom.other_swift_compiler_flags)
+  compiler_flags = -DBUCK -enable-testing -g -Onone -whole-module-optimization -suppress-warnings $(config custom.other_swift_compiler_flags)
   use_filelist = true
 
 [apple]

.gitignore

@@ -29,3 +29,4 @@ buck-out/*
 AppBinary.xcworkspace/*
 Project.xcodeproj/*
 Watch/Watch.xcodeproj/*
+AppBundle.xcworkspace/*

BUCK

@@ -1,16 +1,21 @@
-load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config')
+load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config', 'combined_config')
 load('//tools:buck_defs.bzl', 'SHARED_CONFIGS')
 
 # Adding `-all_load` to our binaries works around https://bugs.swift.org/browse/SR-6004. See the
 # longer comment in `ViewController.swift` for more details.
 ALL_LOAD_LINKER_FLAG = '-all_load'
 
+BUILD_NUMBER = '2001'
+
 APP_CONFIGS = {
     'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES': 'YES',
     'DEVELOPMENT_LANGUAGE': 'Swift',
     'PRODUCT_BUNDLE_IDENTIFIER': 'ph.telegra.Telegraph',
     'PROVISIONING_PROFILE_SPECIFIER': 'match Development ph.telegra.Telegraph',
     'TARGETED_DEVICE_FAMILY': '1,2',
+    'APP_NAME': 'Telegram',
+    'BUILD_NUMBER': BUILD_NUMBER,
+    'CODE_SIGN_ENTITLEMENTS': 'Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements',
 }
 APP_CONFIGS.update(SHARED_CONFIGS)
 
@@ -21,6 +26,30 @@ apple_resource(
     ],
 )
 
+apple_resource(
+    name = "StringResources",
+    files = [],
+    variants = glob([
+        "Telegram-iOS/*.lproj/Localizable.strings",
+    ]),
+)
+
+apple_resource(
+    name = "InfoPlistStringResources",
+    files = [],
+    variants = glob([
+        "Telegram-iOS/*.lproj/InfoPlist.strings",
+    ]),
+)
+
+apple_resource(
+    name = "AppIntentVocabularyStringResources",
+    files = [],
+    variants = glob([
+        "Telegram-iOS/*.lproj/AppIntentVocabulary.plist",
+    ]),
+)
+
 apple_asset_catalog(
     name = 'Images',
     dirs = [
@@ -78,7 +107,6 @@ apple_library(
         'Telegram-iOS/UIImage+ImageEffects.h',
     ],
     modular = True,
-    #visibility = ['//submodules/TelegramUI:TelegramUI'],
     visibility = ['PUBLIC'],
     deps = [
         '//submodules/SSignalKit:SSignalKit',
@@ -90,31 +118,35 @@ apple_library(
 apple_binary(
     name = 'AppBinary',
     configs = configs_with_config(config_with_updated_linker_flags(APP_CONFIGS, ALL_LOAD_LINKER_FLAG)),
-    srcs = glob([
+    #srcs = glob([
-        'Telegram-iOS/*.swift',
+    #    'Telegram-iOS/*.swift',
-    ]) + [
+    #]) + [
-        'Telegram-iOS/main.m',
+    #    'Telegram-iOS/main.m',
-    ],
+    #],
+    srcs = ['Telegram-iOS/TempMain.m'],
     entitlements_file = 'Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements',
     deps = [
         ':LaunchScreenXib',
+        ':StringResources',
+        ':InfoPlistStringResources',
+        ':AppIntentVocabularyStringResources',
         ':Images',
-        '//submodules/AsyncDisplayKit:AsyncDisplayKit',
+        #'//submodules/AsyncDisplayKit:AsyncDisplayKit',
-        '//submodules/MtProtoKit:MtProtoKit',
+        #'//submodules/MtProtoKit:MtProtoKit',
-        '//submodules/SSignalKit:SwiftSignalKit',
+        #'//submodules/SSignalKit:SwiftSignalKit',
-        '//submodules/SSignalKit:SSignalKit',
+        #'//submodules/SSignalKit:SSignalKit',
-        '//submodules/Display:Display',
+        #'//submodules/Display:Display',
-        '//submodules/Postbox:Postbox',
+        #'//submodules/Postbox:Postbox',
-        '//submodules/TelegramCore:TelegramCore',
+        #'//submodules/TelegramCore:TelegramCore',
-        '//submodules/LegacyComponents:LegacyComponents',
+        #'//submodules/LegacyComponents:LegacyComponents',
-        '//submodules/HockeySDK-iOS:HockeySDK',
+        #'//submodules/HockeySDK-iOS:HockeySDK',
-        '//submodules/lottie-ios:Lottie',
+        #'//submodules/lottie-ios:Lottie',
         '//submodules/libtgvoip:tgvoip',
-        '//submodules/webp:WebP',
+        #'//submodules/webp:WebPImage',
-        '//submodules/ffmpeg:FFMpeg',
+        #'//submodules/ffmpeg:FFMpeg',
-        '//submodules/TelegramUI:TelegramUI',
+        #'//submodules/TelegramUI:TelegramUI',
-        '//submodules/TelegramUI:TelegramUIPrivateModule',
+        '//submodules/TelegramUI:TelegramUIFramework',
-        '//Watch:WatchUtils',
+        #'//Watch:WatchUtils',
         ':BuildConfig',
         ':AppBinaryPrivate',
     ],
@@ -140,7 +172,7 @@ apple_bundle(
         'PRODUCT_NAME': 'Telegram',
         'APP_SPECIFIC_URL_SCHEME': 'tgapp',
         'VERSION': '5.8',
-        'BUILD_NUMBER': '2001',
+        'BUILD_NUMBER': BUILD_NUMBER,
     },
 )
 

Telegram-iOS.xcodeproj/project.pbxproj

@@ -5240,6 +5240,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib",
 				);
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lz",

Telegram-iOS/AppDelegate.swift

@@ -1145,7 +1145,9 @@ final class SharedApplicationContext {
             BITHockeyManager.shared().configure(withIdentifier: hockeyAppId, delegate: self)
             BITHockeyManager.shared().crashManager.crashManagerStatus = .alwaysAsk
             BITHockeyManager.shared().start()
-            //BITHockeyManager.shared().authenticator.authenticateInstallation()
+            #if !BUCK
+            BITHockeyManager.shared().authenticator.authenticateInstallation()
+            #endif
         }
         
         NotificationCenter.default.addObserver(forName: NSNotification.Name.UIWindowDidBecomeHidden, object: nil, queue: nil, using: { notification in

Telegram-iOS/en.lproj/Localizable.strings

@@ -4358,6 +4358,7 @@ Any member of this group will be able to see messages in the channel.";
 "Conversation.Block" = "Block";
 "Conversation.ShareMyPhoneNumber" = "Share My Phone Number";
 "Conversation.AddToContacts" = "Add to Contacts";
+"Conversation.AddNameToContacts" = "Add %@ to Contacts";
 
 "AddContact.ContactWillBeSharedNow" = "When you tap **Done**, your phone number will become visible to %@.";
 "AddContact.ContactWillBeSharedAfterMutual" = "Phone number vill be visible once %1$@ adds you as a contact. Your phone number will become visible to %1$@.";
@@ -4396,3 +4397,6 @@ Any member of this group will be able to see messages in the channel.";
 
 "Channel.Management.LabelOwner" = "Owner";
 "Channel.Management.LabelAdministrator" = "Administrator";
+"ContactInfo.PhoneNumberHidden" = "Hidden";
+
+"Common.ActionNotAllowedError" = "Sorry, you are not allowed to do this.";

Watch/BUCK

@@ -1,5 +1,5 @@
-load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config')
+load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config', 'combined_config')
-load('//tools:buck_defs.bzl', 'combined_config', 'SHARED_CONFIGS', 'LIB_SPECIFIC_CONFIG')
+load('//tools:buck_defs.bzl', 'SHARED_CONFIGS', 'EXTENSION_LIB_SPECIFIC_CONFIG')
 
 apple_library(
     name = 'WatchUtils',
@@ -63,7 +63,7 @@ apple_library(
         'Bridge/TGBridgeReplyMessageMediaAttachment.h',
     ],
     modular = True,
-    configs = configs_with_config(combined_config([SHARED_CONFIGS, LIB_SPECIFIC_CONFIG])),
+    configs = configs_with_config(combined_config([SHARED_CONFIGS, EXTENSION_LIB_SPECIFIC_CONFIG])),
     compiler_flags = [
         '-w',
     ],

tools/buck_defs.bzl

@@ -10,11 +10,9 @@ SHARED_CONFIGS = {
 
 LIB_SPECIFIC_CONFIG = {
     'SKIP_INSTALL': 'YES',
-    'APPLICATION_EXTENSION_API_ONLY': 'YES',
 }
 
-def combined_config(dicts):
+EXTENSION_LIB_SPECIFIC_CONFIG = {
-    result = dict()
+    'SKIP_INSTALL': 'YES',
-    for d in dicts:
+    'APPLICATION_EXTENSION_API_ONLY': 'YES',
-        result.update(d)
+}
-    return result

tools/buck_utils.bzl

@@ -75,16 +75,16 @@ def glob_sub_map(prefix, glob_specs):
         result[file_key] = path
     return result
 
-def gen_header_targets(header_paths, prefix, source_rule, source_path):
+def gen_header_targets(header_paths, prefix, flavor, source_rule, source_path):
     result = dict()
     for header_path in header_paths:
         name = prefix + header_path.replace('/', '_sub_')
         native.genrule(
-            name = name,
+            name = name + flavor,
             cmd = 'cp $(location :' + source_rule + ')/' + source_path + '/' + header_path + ' $OUT',
             out = name,
         )
-        result[header_path] = ':' + name
+        result[header_path] = ':' + name + flavor
     return result
 
 def lib_basename(name):
@@ -95,14 +95,17 @@ def lib_basename(name):
         result = result[:-2]
     return result
 
-def gen_lib_targets(lib_paths, prefix, source_rule, source_path):
+def combined_config(dicts):
-    result = []
+    result = dict()
-    for lib_path in lib_paths:
+    for d in dicts:
-        name = lib_path.replace('/', '_sub_')
+        result.update(d)
-        native.genrule(
-            name = name,
-            cmd = 'cp $(location :' + source_rule + ')/' + source_path + '/' + lib_path + ' $OUT',
-            out = name
-        )
-        result.append(name)
     return result
+
+valid_build_variants = ['project', 'release']
+
+def get_build_variant():
+    build_variant = native.read_config('build', 'variant', '')
+    if build_variant not in valid_build_variants:
+        fail('build_variant should be one of %s' % valid_build_variants)
+    return build_variant
+