Skip to content

Commit c0f8f7d

Browse files
committed
Merge commit 'e6b0d669e3efd8da96a9fd4993ca934b547c6457' into beta
2 parents 4e2c463 + e6b0d66 commit c0f8f7d

File tree

930 files changed

+110539
-70293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

930 files changed

+110539
-70293
lines changed

.bazelrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ build --features=swift.enable_vfsoverlays
1919
build --strategy=Genrule=standalone
2020
build --spawn_strategy=standalone
2121

22-
build --strategy=SwiftCompile=standalone
23-
build --define RULES_SWIFT_BUILD_DUMMY_WORKER=1
22+
build --strategy=SwiftCompile=worker
2423

2524
build:swift_profile --jobs=1
2625
build:swift_profile --local_cpu_resources=1

.gitlab-ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ internal:
3131
- python3 -u build-system/Make/DeployBuild.py --configuration="$TELEGRAM_PRIVATE_DATA_PATH/deploy-configurations/enterprise-configuration.json" --ipa="build/artifacts/Telegram.ipa" --dsyms="build/artifacts/Telegram.DSYMs.zip"
3232
environment:
3333
name: internal
34-
artifacts:
35-
when: always
36-
paths:
37-
- build/artifacts
38-
expire_in: 1 week
3934

4035
internal_testflight:
4136
tags:

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
22

3-
bazel_dep(name = "bazel_features", version = "1.30.0")
4-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
3+
bazel_dep(name = "bazel_features", version = "1.33.0")
4+
bazel_dep(name = "bazel_skylib", version = "1.8.1")
55
bazel_dep(name = "platforms", version = "0.0.11")
66

77
bazel_dep(name = "rules_xcodeproj")

MODULE.bazel.lock

Lines changed: 59 additions & 106 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Random.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c796824aa8245ce7309426caa3c4816024abd71d21f3805988aa953a4e826169
1+
06de25b179c80e56

Telegram/BUILD

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ load("@build_bazel_rules_apple//apple:ios.bzl",
88
"ios_application",
99
"ios_extension",
1010
"ios_framework",
11+
"ios_ui_test",
12+
"ios_ui_test_suite",
13+
)
14+
15+
load(
16+
"@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl",
17+
"ios_test_runner",
1118
)
1219

1320
load("@build_bazel_rules_apple//apple:resources.bzl",
@@ -21,6 +28,7 @@ load("@build_bazel_rules_swift//swift:swift.bzl",
2128
load(
2229
"@rules_xcodeproj//xcodeproj:defs.bzl",
2330
"top_level_targets",
31+
"top_level_target",
2432
"xcodeproj",
2533
"xcode_provisioning_profile",
2634
)
@@ -1759,12 +1767,10 @@ xcodeproj(
17591767
bazel_path = telegram_bazel_path,
17601768
project_name = "Telegram",
17611769
tags = ["manual"],
1762-
top_level_targets = top_level_targets(
1763-
labels = [
1764-
":Telegram",
1765-
],
1766-
target_environments = ["device", "simulator"],
1767-
),
1770+
top_level_targets = [
1771+
top_level_target(":Telegram", target_environments = ["device", "simulator"]),
1772+
":iOSAppUITestSuite",
1773+
],
17681774
xcode_configurations = {
17691775
"Debug": {
17701776
"//command_line_option:compilation_mode": "dbg",
@@ -1776,6 +1782,39 @@ xcodeproj(
17761782
default_xcode_configuration = "Debug"
17771783
)
17781784

1785+
filegroup(
1786+
name = "TestSources",
1787+
srcs = glob(["Tests/Sources/**/*.swift"]),
1788+
)
1789+
1790+
ios_test_runner(
1791+
name = "iPhone-17__26.2",
1792+
device_type = "iPhone 17",
1793+
os_version = "26.2",
1794+
)
1795+
1796+
1797+
swift_library(
1798+
name = "iOSAppUITestSuite.library",
1799+
testonly = True,
1800+
srcs = [":TestSources"],
1801+
module_name = "iOSAppUITestSuite",
1802+
tags = ["manual"],
1803+
)
1804+
1805+
ios_ui_test_suite(
1806+
name = "iOSAppUITestSuite",
1807+
bundle_id = "org.telegram.Telegram-iOS-uitests",
1808+
minimum_os_version = "13.0",
1809+
runners = [
1810+
":iPhone-17__26.2",
1811+
],
1812+
tags = ["manual"],
1813+
test_host = "//Telegram",
1814+
visibility = ["@rules_xcodeproj//xcodeproj:generated"],
1815+
deps = [":iOSAppUITestSuite.library"],
1816+
)
1817+
17791818
# Temporary targets used to simplify build tests
17801819

17811820
ios_application(
@@ -1809,7 +1848,7 @@ ios_application(
18091848
#"//third-party/boringssl:ssl",
18101849
#"//third-party/boringssl:crypto",
18111850
#"//submodules/TelegramVoip",
1812-
#"//third-party/recaptcha:RecaptchaEnterpriseSDK",
1851+
#"//third-party/recaptcha:RecaptchaEnterprise",
18131852
"//submodules/TelegramUI",
18141853
],
18151854
)

Telegram/NotificationService/Sources/NotificationService.swift

Lines changed: 662 additions & 15 deletions
Large diffs are not rendered by default.
2.67 KB
Binary file not shown.
6.58 KB
Binary file not shown.

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

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15669,3 +15669,103 @@ Error: %8$@";
1566915669

1567015670
"Conversation.Summary.Limit.Title" = "AI Summary";
1567115671
"Conversation.Summary.Limit.Text" = "Summarize large messages with AI – unlimited with Telegram Premium.";
15672+
15673+
"Appearance.SendWithCmdEnter" = "Send Messages with ⌘+Enter";
15674+
15675+
"Notification.StarsGift.Crafted" = "You crafted a new gift";
15676+
15677+
"Gift.Craft.Title" = "Craft Gift";
15678+
"Gift.Craft.Description" = "Add up to **4 gifts** to craft new\n**$ %@**.\n\nIf crafting fails, all used gifts\nwill be lost.";
15679+
"Gift.Craft.ViewVariants" = "View all craftable models";
15680+
"Gift.Craft.BackdropTooltip" = "**%1$@%** chance the crafted gift will have **%2$@** backdrop.";
15681+
"Gift.Craft.SymbolTooltip" = "**%1$@%** chance the crafted gift will have **%2$@** symbol.";
15682+
"Gift.Craft.Craft" = "Craft %@";
15683+
"Gift.Craft.Crafting.Title" = "Crafting";
15684+
"Gift.Craft.Crafting.Description" = "If crafting fails, all used gifts\nwill be lost.";
15685+
"Gift.Craft.Crafting.SuccessChance" = "%@% Success Chance";
15686+
"Gift.Craft.CraftingFailed.Title" = "Crafting Failed";
15687+
"Gift.Craft.CraftingFailed.Text_1" = "This crafting attempt was unsuccessful.\n**%@ gift** was lost.";
15688+
"Gift.Craft.CraftingFailed.Text_any" = "This crafting attempt was unsuccessful.\n**%@ gifts** were lost.";
15689+
"Gift.Craft.CraftingFailed.CraftAnotherGift" = "Craft Another Gift";
15690+
"Gift.Craft.Info.Title" = "Gift Crafting";
15691+
"Gift.Craft.Info.Description" = "Turn your gifts intro rare, epic,\nuncommon and legendary versions.";
15692+
"Gift.Craft.Info.Paragraph1.Title" = "Get Rare Models";
15693+
"Gift.Craft.Info.Paragraph1.Text" = "Select up to 4 gifts to craft a new exclusive model.";
15694+
"Gift.Craft.Info.Paragraph2.Title" = "Maximize Chances";
15695+
"Gift.Craft.Info.Paragraph2.Text" = "Combine more gifts to increase your odds of success.";
15696+
"Gift.Craft.Info.Paragraph3.Title" = "Affect the Result";
15697+
"Gift.Craft.Info.Paragraph3.Text" = "Use gifts with the same attribute to boost it's chance.";
15698+
"Gift.Craft.Info.Understood" = "Understood";
15699+
"Gift.Craft.Unavailable.Title" = "Crafting Unavailable";
15700+
"Gift.Craft.Unavailable.Text" = "This gift will become available for crafting on **%@**.";
15701+
"Gift.Craft.Error.NotAvailable" = "One of the gifts is not available for crafting.";
15702+
15703+
"Gift.Craft.Select.Title" = "Select Gifts";
15704+
"Gift.Craft.Select.YourGifts" = "Your Gifts";
15705+
"Gift.Craft.Select.SaleGiftsCount_1" = "%@ Suitable Gift On Sale";
15706+
"Gift.Craft.Select.SaleGiftsCount_any" = "%@ Suitable Gifts On Sale";
15707+
"Gift.Craft.Select.NoGiftsFromCollection" = "You don't have other gifts\nfrom this collection";
15708+
15709+
"Gift.Attribute.Rare" = "rare";
15710+
"Gift.Attribute.Legendary" = "legendary";
15711+
"Gift.Attribute.Epic" = "epic";
15712+
"Gift.Attribute.Uncommon" = "uncommon";
15713+
15714+
"SocksProxySetup.CheckStatus" = "Check Status";
15715+
"SocksProxySetup.Warning.Title" = "Warning";
15716+
"SocksProxySetup.Warning.Text" = "This action will expose your IP address to the admin of the proxy server.";
15717+
"SocksProxySetup.Warning.Proceed" = "Proceed";
15718+
15719+
"Gift.Variants.CollectionInfo.CraftableModel_1" = "**%@** craftable model";
15720+
"Gift.Variants.CollectionInfo.CraftableModel_any" = "**%@** craftable models";
15721+
"Gift.Variants.ViewCraftableModels" = "View Craftable Models";
15722+
"Gift.Variants.ViewPrimaryModels" = "View Primary Models";
15723+
15724+
"Gift.View.OnSale" = "On sale for %@";
15725+
15726+
"Gift.Store.Balance.MyStars" = "My Stars";
15727+
"Gift.Store.Balance.MyTon" = "My TON";
15728+
15729+
"Resolve.GiftErrorNotFound" = "Sorry, this gift doesn't seem to exist.";
15730+
"Resolve.GiftErrorBurned" = "Sorry, this gift has already been burned.";
15731+
15732+
"Notification.StarGift.Burned" = "burned";
15733+
15734+
"AuthConfirmation.Title" = "Log in to **%@**";
15735+
"AuthConfirmation.Description" = "This site will receive your **name**,\n**username** and **profile photo**.";
15736+
"AuthConfirmation.Device" = "Device";
15737+
"AuthConfirmation.IpAddress" ="IP Address";
15738+
"AuthConfirmation.Info" ="This login attempt came from the device above.";
15739+
"AuthConfirmation.AllowMessages" = "Allow Messages";
15740+
"AuthConfirmation.AllowMessagesInfo" = "This will allow %@ to message you.";
15741+
"AuthConfirmation.Cancel" = "Cancel";
15742+
"AuthConfirmation.LogIn" = "Log In";
15743+
15744+
"AuthConfirmation.PhoneNumberConfirmation.Title" = "Phone Number";
15745+
"AuthConfirmation.PhoneNumberConfirmation.Text" = "**%1$@** wants to access your phone number **%2$@**.\n\nAllow access?";
15746+
"AuthConfirmation.PhoneNumberConfirmation.Deny" = "Deny";
15747+
"AuthConfirmation.PhoneNumberConfirmation.Allow" = "Allow";
15748+
15749+
"AuthConfirmation.LoginSuccess.Title" = "Login Successful";
15750+
"AuthConfirmation.LoginSuccess.Text" = "You are now logged in to [%@]().";
15751+
"AuthConfirmation.LoginSuccess.TextNoNumber" = "You are logged in to [%@](), but you didn't grant access to your phone number.";
15752+
15753+
"AuthConfirmation.LoginFail.Title" = "Login Failed";
15754+
"AuthConfirmation.LoginFail.Text" = "Please try logging in to [%@]() again.";
15755+
15756+
"Notification.GroupCreatorChangePending" = "%2$@ will become the new main admin in 7 days if %1$@ does not return.";
15757+
"Notification.GroupCreatorChangeApplied" = "%1$@ has transferred ownership of the group to %2$@.";
15758+
15759+
"Notification.StarGift.Crafted.Title" = "Crafted Gift";
15760+
"Notification.StarGift.Upgraded.Title" = "Upgraded Gift";
15761+
"Notification.StarGift.Purchased.Title" = "Purchased Gift";
15762+
15763+
"LeaveGroup.Title" = "Leave %@";
15764+
"LeaveGroup.Text" = "If you leave, **%1$@** will become the owner of **%2$@** in **1 week**.";
15765+
"LeaveGroup.AppointAnotherOwner" = "Appoint Another Owner";
15766+
"LeaveGroup.Proceed" = "Leave Group";
15767+
"AppointAnotherOwner.Title" = "Choose New Owner";
15768+
15769+
"Gift.View.Context.Craft" = "Craft";
15770+
15771+
"Group.OwnershipTransfer.DescriptionShortInfo" = "This will transfer the full **owner rights** for **%1$@** to **%2$@**.";

0 commit comments

Comments
 (0)