Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Author: overtake

.cursorignore

@@ -1 +1,2 @@
 # Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+spm-files

.gitignore

@@ -73,3 +73,4 @@ buildServer.json
 .build/**
 Telegram.LSP.json
 **/.build/**
+spm-files

.vscode/settings.json

@@ -11,5 +11,8 @@
     },
     "search.exclude": {
         ".git/**": true
+    },
+    "files.associations": {
+        "memory": "cpp"
     }
 }

Telegram/BUILD

@@ -55,6 +55,10 @@ load("@build_bazel_rules_apple//apple:resources.bzl",
     "swift_intent_library",
 )
 
+load("//build-system/bazel-utils:spm.bzl",
+    "generate_spm",
+)
+
 config_setting(
     name = "debug",
     values = {
@@ -952,29 +956,6 @@ plist_fragment(
     )
 )
 
-ios_framework(
-    name = "TelegramApiFramework",
-    bundle_id = "{telegram_bundle_id}.TelegramApi".format(
-        telegram_bundle_id = telegram_bundle_id,
-    ),
-    families = [
-        "iphone",
-        "ipad",
-    ],
-    infoplists = [
-        ":TelegramApiInfoPlist",
-        ":BuildNumberInfoPlist",
-        ":VersionInfoPlist",
-        ":RequiredDeviceCapabilitiesPlist",
-    ],
-    minimum_os_version = minimum_os_version,
-    extension_safe = True,
-    ipa_post_processor = strip_framework,
-    deps = [
-        "//submodules/TelegramApi:TelegramApi",
-    ],
-)
-
 plist_fragment(
     name = "TelegramCoreInfoPlist",
     extension = "plist",
@@ -2022,7 +2003,45 @@ xcodeproj(
     default_xcode_configuration = "Debug"
 )
 
-# Temporary targets used to simplify webrtc build tests
+# Temporary targets used to simplify build tests
+
+ios_application(
+    name = "spm_build_app",
+    bundle_id = "{telegram_bundle_id}".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = ["iphone", "ipad"],
+    minimum_os_version = minimum_os_version,
+    provisioning_profile = select({
+        ":disableProvisioningProfilesSetting": None,
+        "//conditions:default": "@build_configuration//provisioning:Telegram.mobileprovision",
+    }),
+    entitlements = ":TelegramEntitlements.entitlements",
+    infoplists = [
+        ":TelegramInfoPlist",
+        ":BuildNumberInfoPlist",
+        ":VersionInfoPlist",
+        ":RequiredDeviceCapabilitiesPlist",
+        ":UrlTypesInfoPlist",
+    ],
+    deps = [
+        #"//submodules/MtProtoKit",
+        #"//submodules/SSignalKit/SwiftSignalKit",
+        #"//submodules/Postbox",
+        #"//submodules/TelegramApi",
+        #"//submodules/TelegramCore",
+        #"//submodules/FFMpegBinding",
+        "//submodules/Display",
+        #"//third-party/webrtc",
+    ],
+)
+
+generate_spm(
+    name = "spm_build_root",
+    deps = [
+        ":spm_build_app",
+    ]
+)
 
 ios_application(
     name = "webrtc_build_test",
@@ -2044,7 +2063,7 @@ ios_application(
         ":UrlTypesInfoPlist",
     ],
     deps = [
-        "//third-party/webrtc:webrtc_lib",
+        "//third-party/webrtc:webrtc",
     ],
 )
 

Telegram/BroadcastUpload/BroadcastUploadExtension.swift

@@ -336,7 +336,7 @@ private final class EmbeddedBroadcastUploadImpl: BroadcastUploadImpl {
         let logsPath = rootPath + "/logs/broadcast-logs"
         let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
 
-        let embeddedBroadcastImplementationTypePath = rootPath + "/broadcast-coordination-type"
+        let embeddedBroadcastImplementationTypePath = rootPath + "/broadcast-coordination-type-v2"
 
         var useIPCContext = false
         if let typeData = try? Data(contentsOf: URL(fileURLWithPath: embeddedBroadcastImplementationTypePath)), let type = String(data: typeData, encoding: .utf8) {

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -14262,6 +14262,7 @@ Sorry for the inconvenience.";
 
 "PeerInfo.Gifts.Sale" = "sale";
 
+"Gift.Store.ForResaleNoResults" = "no results";
 "Gift.Store.ForResale_1" = "%@ for resale";
 "Gift.Store.ForResale_any" = "%@ for resale";
 "Gift.Store.Sort.Price" = "Price";
@@ -14291,8 +14292,31 @@ Sorry for the inconvenience.";
 "MediaPicker.CreateStory_any" = "Create %@ Stories";
 "MediaPicker.CombineIntoCollage" = "Combine into Collage";
 
-"Gift.Resale.Unavailable.Title" = "Resell Gift";
-"Gift.Resale.Unavailable.Text" = "Sorry, you can't list this gift yet.\n\Reselling will be available on %@.";
+"Gift.Resale.Unavailable.Title" = "Try Later";
+"Gift.Resale.Unavailable.Text" = "You will be able to resell this gift on %@.";
 
-"Gift.Transfer.Unavailable.Title" = "Transfer Gift";
-"Gift.Transfer.Unavailable.Text" = "Sorry, you can't transfer this gift yet.\n\Transferring will be available on %@.";
+"Gift.Transfer.Unavailable.Title" = "Try Later";
+"Gift.Transfer.Unavailable.Text" = "You will be able to transfer this gift on %@.";
+
+"Premium.CreateMultipleStories" = "Create Multiple Stories";
+
+"FrozenAccount.Violation.TextNew" = "Your account was frozen for breaking Telegram's [Terms and Conditions]().";
+"FrozenAccount.Violation.TextNew_URL" = "https://telegram.org/tos";
+
+"Stars.Purchase.BuyStarGiftInfo" = "Buy Stars to acquire a unique collectible.";
+
+"Stars.Purchase.EnoughStars" = "You have enough stars at the moment.";
+"Stars.Purchase.BuyAnyway" = "Buy Anyway";
+
+"Gift.Buy.Confirm.Title" = "Confirm Payment";
+"Gift.Buy.Confirm.Text" = "Do you really want to buy **%1$@** for %2$@?";
+"Gift.Buy.Confirm.GiftText" = "Do you really want to buy **%1$@** for %2$@ and gift it to **%3$@**?";
+"Gift.Buy.Confirm.Text.Stars_1" = "**%@** Star";
+"Gift.Buy.Confirm.Text.Stars_any" = "**%@** Stars";
+"Gift.Buy.Confirm.BuyFor_1" = "Buy for %@ Star";
+"Gift.Buy.Confirm.BuyFor_any" = "Buy for %@ Stars";
+
+"Calls.HideCallsTab" = "Hide Calls Tab";
+
+"Story.Editor.TooltipSelection_1" = "Tap here to view your %@ story";
+"Story.Editor.TooltipSelection_any" = "Tap here to view your %@ stories";

Tests/CallUITest/Sources/ViewController.swift

@@ -35,7 +35,8 @@ public final class ViewController: UIViewController {
         isRemoteAudioMuted: false,
         localVideo: nil,
         remoteVideo: nil,
-        isRemoteBatteryLow: false
+        isRemoteBatteryLow: false,
+        enableVideoSharpening: false
     )
 
     private var currentLayout: (size: CGSize, insets: UIEdgeInsets)?

build-system/Make/Make.py

@@ -393,6 +393,58 @@ def invoke_query(self, query_args):
         print(subprocess.list2cmdline(combined_arguments))
         call_executable(combined_arguments)
 
+    def get_spm_aspect_invocation(self):
+        combined_arguments = [
+            self.build_environment.bazel_path
+        ]
+        combined_arguments += self.get_startup_bazel_arguments()
+        combined_arguments += ['build']
+
+        if self.custom_target is not None:
+            combined_arguments += [self.custom_target]
+        else:
+            combined_arguments += ['Telegram/Telegram']
+
+        if self.continue_on_error:
+            combined_arguments += ['--keep_going']
+        if self.show_actions:
+            combined_arguments += ['--subcommands']
+
+        if self.enable_sandbox:
+            combined_arguments += ['--spawn_strategy=sandboxed']
+
+        if self.disable_provisioning_profiles:
+            combined_arguments += ['--//Telegram:disableProvisioningProfiles']
+
+        if self.configuration_path is None:
+            raise Exception('configuration_path is not defined')
+
+        combined_arguments += [
+            '--override_repository=build_configuration={}'.format(self.configuration_path)
+        ]
+
+        combined_arguments += self.common_args
+        combined_arguments += self.common_build_args
+        combined_arguments += self.get_define_arguments()
+        combined_arguments += self.get_additional_build_arguments()
+
+        if self.remote_cache is not None:
+            combined_arguments += [
+                '--remote_cache={}'.format(self.remote_cache),
+                '--experimental_remote_downloader={}'.format(self.remote_cache)
+            ]
+        elif self.cache_dir is not None:
+            combined_arguments += [
+                '--disk_cache={path}'.format(path=self.cache_dir)
+            ]
+
+        combined_arguments += self.configuration_args
+
+        combined_arguments += ['--aspects', '//build-system/bazel-utils:spm.bzl%spm_text_aspect']
+        
+        print(subprocess.list2cmdline(combined_arguments))
+        call_executable(combined_arguments)
+
 
 def clean(bazel, arguments):
     bazel_command_line = BazelCommandLine(
@@ -696,6 +748,36 @@ def query(bazel, arguments):
     bazel_command_line.invoke_query(query_args)
 
 
+def get_spm_aspect_invocation(bazel, arguments):
+    bazel_command_line = BazelCommandLine(
+        bazel=bazel,
+        override_bazel_version=arguments.overrideBazelVersion,
+        override_xcode_version=arguments.overrideXcodeVersion,
+        bazel_user_root=arguments.bazelUserRoot
+    )
+
+    if arguments.cacheDir is not None:
+        bazel_command_line.add_cache_dir(arguments.cacheDir)
+    elif arguments.cacheHost is not None:
+        bazel_command_line.add_remote_cache(arguments.cacheHost)
+
+    resolve_configuration(
+        base_path=os.getcwd(),
+        bazel_command_line=bazel_command_line,
+        arguments=arguments,
+        additional_codesigning_output_path=None
+    )
+
+    bazel_command_line.set_configuration(arguments.configuration)
+    bazel_command_line.set_build_number(arguments.buildNumber)
+    bazel_command_line.set_custom_target(arguments.target)
+    bazel_command_line.set_continue_on_error(False)
+    bazel_command_line.set_show_actions(False)
+    bazel_command_line.set_enable_sandbox(False)
+    bazel_command_line.set_split_swiftmodules(False)
+
+    bazel_command_line.get_spm_aspect_invocation()
+
 def add_codesigning_common_arguments(current_parser: argparse.ArgumentParser):
     configuration_group = current_parser.add_mutually_exclusive_group(required=True)
     configuration_group.add_argument(
@@ -1121,6 +1203,38 @@ def add_project_and_build_common_arguments(current_parser: argparse.ArgumentPars
         metavar='query_string'
     )
 
+    spm_parser = subparsers.add_parser('spm', help='Generate SPM package')
+    spm_parser.add_argument(
+        '--target',
+        type=str,
+        help='A custom bazel target name to build.',
+        metavar='target_name'
+    )
+    spm_parser.add_argument(
+        '--buildNumber',
+        required=False,
+        type=int,
+        default=10000,
+        help='Build number.',
+        metavar='number'
+    )
+    spm_parser.add_argument(
+        '--configuration',
+        choices=[
+            'debug_universal',
+            'debug_arm64',
+            'debug_armv7',
+            'debug_sim_arm64',
+            'release_sim_arm64',
+            'release_arm64',
+            'release_armv7',
+            'release_universal'
+        ],
+        required=True,
+        help='Build configuration'
+    )
+    add_codesigning_common_arguments(spm_parser)
+
     if len(sys.argv) < 2:
         parser.print_help()
         sys.exit(1)
@@ -1229,6 +1343,8 @@ def add_project_and_build_common_arguments(current_parser: argparse.ArgumentPars
             test(bazel=bazel_path, arguments=args)
         elif args.commandName == 'query':
             query(bazel=bazel_path, arguments=args)
+        elif args.commandName == 'spm':
+            get_spm_aspect_invocation(bazel=bazel_path, arguments=args)
         else:
             raise Exception('Unknown command')
     except KeyboardInterrupt: