Skip to content

Commit 1617e78

Browse files
committed
Merge remote-tracking branch 'upstream'
2 parents bbd6883 + 1e1a4dd commit 1617e78

6,097 files changed

Lines changed: 1440594 additions & 3919 deletions

File tree

Some content is hidden

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

.gitmodules

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
url = https://github.com/lz4/lz4
2323
shallow = true
2424
[submodule "androidx-media"]
25-
path = thirdparty/androidx-media
25+
path = thirdparty/androidx-media/legacy
2626
url = https://github.com/androidx/media
2727
shallow = true
2828
branch = release
@@ -129,3 +129,9 @@
129129
[submodule "rtc_third_party"]
130130
path = app/jni/third_party/webrtc_deps/third_party
131131
url = https://chromium.googlesource.com/chromium/src/third_party
132+
[submodule "thirdparty/androidx-media/latest"]
133+
path = thirdparty/androidx-media/latest
134+
url = https://github.com/androidx/media
135+
[submodule "thirdparty/androidx-media/lollipop"]
136+
path = thirdparty/androidx-media/lollipop
137+
url = https://github.com/androidx/media

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,13 @@ After submitting a pull request and its initial review, special build including
7575

7676
## Reproducing public builds
7777

78-
In order to verify that there is no additional source code injected inside official APKs, you must use **Ubuntu 21.04** for builds published before [26th May 2023](https://github.com/TGX-Android/Telegram-X/commit/e9a054a0f469a98a13f7e0d751539687fef8759b) or **Ubuntu 22.04.2 LTS** for any newer releases, and comply with the following requirements:
78+
In order to verify that there is no additional source code injected inside official APKs, you must use one of the following versions of **Ubuntu**:
79+
80+
* **21.04**: for builds published before [26th May 2023](https://github.com/TGX-Android/Telegram-X/commit/e9a054a0f469a98a13f7e0d751539687fef8759b)
81+
* **22.04.2 LTS**: for builds published before 27th September 2025
82+
* **24.04 LTS**: for any newer releases.
83+
84+
And update its configuration:
7985

8086
1. Create user called `vk` with the home directory located at `/home/vk`
8187
2. Clone `tgx` repository to `/home/vk/tgx`

app/agconnect-services.json

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{
2+
"agcgw" : {
3+
"url" : "connect-dre.dbankcloud.cn",
4+
"backurl" : "connect-dre.hispace.hicloud.com",
5+
"websocketurl" : "connect-ws-dre.hispace.dbankcloud.cn",
6+
"websocketbackurl" : "connect-ws-dre.hispace.dbankcloud.com"
7+
},
8+
"agcgw_all" : {
9+
"SG" : "connect-dra.dbankcloud.cn",
10+
"SG_back" : "connect-dra.hispace.hicloud.com",
11+
"CN" : "connect-drcn.dbankcloud.cn",
12+
"CN_back" : "connect-drcn.hispace.hicloud.com",
13+
"RU" : "connect-drru.hispace.dbankcloud.ru",
14+
"RU_back" : "connect-drru.hispace.dbankcloud.cn",
15+
"DE" : "connect-dre.dbankcloud.cn",
16+
"DE_back" : "connect-dre.hispace.hicloud.com"
17+
},
18+
"websocketgw_all" : {
19+
"SG" : "connect-ws-dra.hispace.dbankcloud.cn",
20+
"SG_back" : "connect-ws-dra.hispace.dbankcloud.com",
21+
"CN" : "connect-ws-drcn.hispace.dbankcloud.cn",
22+
"CN_back" : "connect-ws-drcn.hispace.dbankcloud.com",
23+
"RU" : "connect-ws-drru.hispace.dbankcloud.ru",
24+
"RU_back" : "connect-ws-drru.hispace.dbankcloud.cn",
25+
"DE" : "connect-ws-dre.hispace.dbankcloud.cn",
26+
"DE_back" : "connect-ws-dre.hispace.dbankcloud.com"
27+
},
28+
"client" : {
29+
"cp_id" : "890971000000000430",
30+
"product_id" : "9105385871708486477",
31+
"client_id" : "302165282904867840",
32+
"client_secret" : "0D3FF684AF7E3F3BB1180C3492C35548EF146643342FF792CCAC03A6CD5C25B7",
33+
"project_id" : "9105385871708486477",
34+
"app_id" : "101754199",
35+
"api_key" : "DgEDAJ2fXpaebqOQWzf3nRYQuF0u9obUw+KffFVFQFwM2dROO1Kmhd/8B2PkMRQKslxdzWdVVc+UcIw/VpTzznY5imzxK5aJ/8fa8Q==",
36+
"package_name" : "org.thunderdog.challegram"
37+
},
38+
"oauth_client" : {
39+
"client_id" : "101754199",
40+
"client_type" : 1
41+
},
42+
"app_info" : {
43+
"app_id" : "101754199",
44+
"package_name" : "org.thunderdog.challegram"
45+
},
46+
"service" : {
47+
"analytics" : {
48+
"collector_url" : "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
49+
"collector_url_cn" : "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
50+
"collector_url_de" : "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
51+
"collector_url_ru" : "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
52+
"collector_url_sg" : "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
53+
"resource_id" : "p1",
54+
"channel_id" : ""
55+
},
56+
"ml" : {
57+
"mlservice_url" : "ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
58+
},
59+
"cloudstorage" : {
60+
"storage_url" : "https://agc-storage-drcn.platform.dbankcloud.cn",
61+
"storage_url_ru" : "https://agc-storage-drru.cloud.huawei.ru",
62+
"storage_url_sg" : "https://ops-dra.agcstorage.link",
63+
"storage_url_de" : "https://ops-dre.agcstorage.link",
64+
"storage_url_cn" : "https://agc-storage-drcn.platform.dbankcloud.cn",
65+
"storage_url_ru_back" : "https://agc-storage-drru.cloud.huawei.ru",
66+
"storage_url_sg_back" : "https://agc-storage-dra.cloud.huawei.asia",
67+
"storage_url_de_back" : "https://agc-storage-dre.cloud.huawei.eu",
68+
"storage_url_cn_back" : "https://agc-storage-drcn.cloud.huawei.com.cn"
69+
},
70+
"search" : {
71+
"url" : "https://search-dre.cloud.huawei.com"
72+
},
73+
"edukit" : {
74+
"edu_url" : "edukit.cloud.huawei.com.cn",
75+
"dh_url" : "edukit.cloud.huawei.com.cn"
76+
}
77+
},
78+
"region" : "DE",
79+
"configuration_version" : "3.0",
80+
"appInfos" : [
81+
{
82+
"package_name" : "org.thunderdog.challegram",
83+
"client" : {
84+
"app_id" : "101754199"
85+
},
86+
"app_info" : {
87+
"package_name" : "org.thunderdog.challegram",
88+
"app_id" : "101754199"
89+
},
90+
"oauth_client" : {
91+
"client_type" : 1,
92+
"client_id" : "101754199"
93+
}
94+
}
95+
]
96+
}

0 commit comments

Comments
 (0)