Commit Graph

326 Commits

Author SHA1 Message Date
Next Alone
4196484d20
Merge remote-tracking branch 'Official/master' into dev
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/assets/countries.txt
#	TMessagesProj/src/main/java/com/google/zxing/qrcode/QRCodeWriter.java
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLog.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/LocationSharingService.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/SimpleTextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/SearchAdapterHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SessionCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedLinkCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell2.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AdminLogFilterAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/DataSettingsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupInviteActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/PremiumPreviewFragment.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	gradle.properties
2022-12-11 08:45:08 +08:00
xaxtix
b73fc8de38 update to 9.2.0 2022-12-06 23:13:44 +04:00
Next Alone
2b242c0309
Merge remote-tracking branch 'NekoX/dev' into dev 2022-12-02 18:44:57 +08:00
luvletter2333
b95fa5971d
merge official 9.1.6 2022-12-02 16:57:16 +08:00
luvletter2333
6b59317fa6
merge official 2022-12-02 16:15:42 +08:00
xaxtix
4951061dde update to 9.1.3 2022-11-12 12:41:35 +04:00
xaxtix
342e681114 update to 9.1.1 2022-11-06 05:16:30 +04:00
xaxtix
67b1fd17e6 update to 9.1.0 2022-11-05 16:34:47 +04:00
1019f970f1
Merge remote-tracking branch 'nekox/dev' into dev 2022-10-11 17:44:53 +08:00
luvletter2333
4c8b0b14fa
merge official 2022-10-11 11:07:58 +08:00
xaxtix
11edd5ee0d update to 9.0.1 2022-09-18 21:02:37 +04:00
xaxtix
abb896635f update to 9.0.0 2022-09-16 22:48:21 +04:00
c484830b81
Merge remote-tracking branch 'nekox/dev' into dev 2022-08-18 00:29:30 +08:00
luvletter2333
6c5fae9fae
merge official 8.9.3
TODO:
1. Fix FCM
2. Fix OSM
3. Add Google Maps into release
2022-08-17 16:45:51 +08:00
xaxtix
b1aa2020e5 update to 8.9.0 2022-08-12 19:23:51 +04:00
3d63bb2364
feat: Add datacenter status page
Co-authored-by: NekoInverter <chsqwyx@gmail.com>
2022-07-29 22:42:05 +08:00
Next Alone
6c9b129c7c
Merge remote-tracking branch 'NekoX/dev' into dev 2022-07-06 21:33:24 +08:00
luvletter2333
0a05e0476b
Merge official v8.8.4 2022-06-30 19:19:47 +08:00
luvletter2333
73cb11f883
Merge official v8.8.3 2022-06-30 19:16:32 +08:00
xaxtix
0a3abc5158 update to 8.8.4 2022-06-28 14:00:33 +04:00
xaxtix
96dce2c9aa Update to 8.8.2 2022-06-21 06:51:00 +04:00
NextAlone
1095a982a7
Merge remote-tracking branch 'NekoX/dev' into dev
# Conflicts:
#	.github/workflows/debug.yml
#	TMessagesProj/build.gradle
#	TMessagesProj/jni/voip/CMakeLists.txt
#	TMessagesProj/jni/voip/org_telegram_messenger_voip_Instance.cpp
#	TMessagesProj/src/main/java/org/telegram/messenger/DownloadController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
#	TMessagesProj/src/main/java/org/telegram/messenger/video/MediaCodecVideoConvertor.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/Instance.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java
#	TMessagesProj/src/main/java/org/telegram/ui/CameraScanActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSelectionHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayoutPreview.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatScrimPopupContainerLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatThemeBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/MotionBackgroundDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ReactedUsersListView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/voip/CellFlickerDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ThemePreviewActivity.java
#	TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
#	TMessagesProj/src/main/res/values-de/strings_nekox.xml
#	TMessagesProj/src/main/res/values-fr/strings_nekox.xml
#	TMessagesProj/src/main/res/values/strings_neko.xml
#	TMessagesProj/src/main/res/values/strings_nekox.xml
2022-05-09 01:30:03 +08:00
luvletter2333
fa99e892bc
Merge official 8.7.0 2022-05-08 14:59:55 +08:00
luvletter2333
f4a6c1223a
remove unused proxy changes 2022-05-03 01:34:22 +08:00
xaxtix
8283c12364 Update to 8.7.2 2022-04-23 12:51:09 +03:00
xaxtix
8309ac8d7c Update to 8.7.1 2022-04-21 21:03:20 +03:00
xaxtix
1e50785b90 Update to 8.7.0 2022-04-16 17:43:17 +03:00
luvletter2333
b16a3bb372
remove unused proxy changes 2022-04-12 20:28:29 +08:00
xaxtix
0cec276463
chore: merged 8.6.2 2022-03-24 19:25:16 +08:00
luvletter2333
a6c39637da
merge official 8.6.2 2022-03-24 13:58:27 +08:00
NextAlone
22aa6abe7c
fix: lib webp 2022-03-23 01:09:22 +08:00
NextAlone
1c913eb76a
chore: upgrade submodule 2022-03-23 01:09:21 +08:00
xaxtix
0abe4541dd Update to 8.6.2 2022-03-20 23:22:37 +03:00
luvletter2333
fa5b44b51e
merge official v8.6.1 2022-03-13 22:48:25 +08:00
xaxtix
5d5527525f Update to 8.6.1 2022-03-13 04:58:00 +03:00
xaxtix
d30f796d8c Update to 8.6.0 2022-03-11 19:49:54 +03:00
luvletter2333
ab0c0ed4d8
Fix possible native crash? 2022-02-18 16:01:55 +08:00
luvletter2333
92bb673a32
Merge official 8.5.2 2022-02-12 15:12:39 +08:00
xaxtix
3b4919a542 Update to 8.5.1 2022-02-12 08:22:45 +03:00
luvletter2333
ba9f84efee Fix release CI 2022-02-04 22:09:14 +08:00
luvletter2333
c811f7d06b Fix ffmpeg build 2022-02-04 20:17:14 +08:00
luvletter2333
672c7e8688 Fix libvpx x86 build 2022-02-04 15:44:02 +08:00
luvletter2333
be79f8f6de Merge official v8.5.1 2022-02-04 11:38:57 +08:00
luvletter2333
c60fd69b04 Fix ffmpeg build script 2022-02-04 11:28:29 +08:00
xaxtix
146cea26cd Update to 8.5.1 2022-02-04 01:18:58 +03:00
luvletter2333
db1ba95ae5 Fix libvpx builds 2022-02-04 00:45:34 +08:00
luvletter2333
d4e8d513c4 Update native build scripts from tfoss 2022-02-03 23:25:39 +08:00
luvletter2333
cdc56f97e7 Update ffmpeg to v4.3.3 2022-02-03 23:17:38 +08:00
luvletter2333
d54dd02b59 Merge official v8.5.0 2022-02-03 23:02:55 +08:00
xaxtix
a1817ea7d3 Update build_ffmpeg script 2022-02-01 19:07:33 +03:00
xaxtix
ee217d739f Update to 8.5.0 2022-02-01 17:05:27 +03:00
xaxtix
ad05eea682 Update to 8.5.0 2022-02-01 16:00:45 +03:00
luvletter2333
65f7479c7c
Add libvpx build for x86 and x86_64 2021-12-24 00:17:48 +08:00
thermatk
ef1107f2f5
[TF][JNI] libvpx rebuild binaries
(cherry picked from commit 699e7b41bf7d99a01d864bde8912ef8164c5d142)
2021-12-23 23:52:51 +08:00
thermatk
0bed4a37d0
[TF][JNI] kill libvpx binaries
(cherry picked from commit 00f05c8b171f1ea23687bb502238158eac3f39fe)
2021-12-23 23:51:12 +08:00
luvletter2333
6f01267133
Update boringssl 2021-12-23 23:48:29 +08:00
xaxtix
dee3203dfa Update to 8.3.0 2021-12-08 20:56:05 +08:00
xaxtix
3477d72367 Update to 8.3.0 2021-12-08 15:02:09 +03:00
luvletter2333
fb0a01b4d1
upgrade AGP to 7.0.3 and fix builds 2021-11-17 20:18:05 +08:00
luvletter2333
6233580e24
Fix test dc handshake 2021-11-05 01:45:34 +08:00
Luv Letter
ef0f3cd542
Revert ack changes 2021-11-01 21:26:55 +08:00
luvletter2333
6aeb6f679e
Fix AudioStream 2021-11-01 00:05:18 +08:00
luvletter2333
34c63b4991
Fix ffmpeg build 2021-10-31 23:06:27 +08:00
luvletter2333
ef9a38a104
Fix stream video 2021-10-31 22:09:13 +08:00
luvletter2333
af9c719d69
sync native with tfoss 2021-10-31 21:09:32 +08:00
luvletter2333
65548549fd
merge official update 8.0.1 2021-09-20 17:14:20 +08:00
xaxtix
42feed0f42 Update to 8.0.1 (2428) 2021-09-20 08:54:41 +03:00
luvletter2333
43001f700a
Fix stringstream in Group VoIP 2021-09-20 13:33:34 +08:00
xaxtix
418f478a62 Update to 8.0.1 (2428) 2021-09-20 01:10:42 +03:00
luvletter2333
986762f504
Merge official update v8.0.0 2021-09-01 15:10:12 +08:00
DrKLO
368822d20f Update to 8.0.0 (2406) 2021-08-31 22:06:39 +03:00
luvletter2333
891a10e69c
Custom group voip audio bitrate 2021-08-21 04:23:27 +08:00
luvletter2333
d87666c9c1
merge official v7.9.2 & v7.9.3 2021-08-07 17:28:34 +08:00
DrKLO
fc12550efb Update to 7.9.2 (2389) 2021-08-05 23:35:18 +03:00
luvletter2333
1cc03ad060 merge upstream v7.9.0 & v7.9.1 2021-08-01 09:31:28 -04:00
DrKLO
24c6968b8a Update to 7.9.1 (2387) 2021-07-31 06:39:13 +07:00
DrKLO
3e5d2ba92b Update to 7.9.0 (2384) 2021-07-30 21:49:55 +07:00
luvletter2333
01aedba9a8
merge upstream v7.8.2 2021-07-26 21:41:28 +08:00
DrKLO
7a60f948ae Update to 7.8.2 (2376)
Thanks to @alabiaga and @marcelpinto for help with improvements for Android 12.
https://github.com/DrKLO/Telegram/pull/1633
https://github.com/DrKLO/Telegram/pull/1636
https://github.com/DrKLO/Telegram/pull/1630
2021-07-19 18:56:43 +03:00
luvletter2333
17dd08d9ba
merge official v7.8.1 2021-07-16 14:10:08 +08:00
DrKLO
3ac3c37dd2 Update to 7.8.1 2021-07-15 17:24:57 +03:00
luvletter2333
067fe3c18a
fix ffmpeg header file 2021-06-26 03:24:41 +08:00
世界
cd036ed2ca
Merge remote-tracking branch 'upstream/master' 2021-06-26 00:02:05 +08:00
DrKLO
e8d88e56e4 Update to 7.8.0 (2359) 2021-06-25 03:43:10 +03:00
世界
1f553870bf
Don't send ack request when handshaking 2021-05-18 18:08:09 +08:00
世界
ec6ae15448
Merge upstream 7.7.2 (2293)
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
2021-04-17 22:37:39 +08:00
luvletter2333
3d4ab4fb89
Revert: set longer timeout 2021-04-17 22:37:19 +08:00
DrKLO
a5939ccb34 Update to 7.7.2 (2293) 2021-04-17 17:25:35 +03:00
世界
023e6639c4
Merge upstream 7.7.1 (2291) 2021-04-17 08:13:31 +08:00
DrKLO
c4ada53b0d Update to 7.7.1 (2291) 2021-04-17 02:59:59 +03:00
世界
aa21a87a10
Merge upstream 7.7.0 (2284)
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/google-services.json
#	TMessagesProj/jni/TgNetWrapper.cpp
#	TMessagesProj/jni/tgnet/ConnectionsManager.h
#	TMessagesProj/src/main/AndroidManifest.xml
#	TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/ImageLocation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/messenger/WearDataLayerListenerService.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/SimpleTextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogMeUrlCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell2.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PaymentFormActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
2021-04-14 10:15:57 +08:00
DrKLO
8bf056e27b Update to 7.7.0 (2284) 2021-04-14 04:44:46 +03:00
世界
2c28b02448
Use shared okhttp client 2021-04-13 11:08:06 +08:00
世界
5d88b7c83e
Increase proxy timeout 2021-04-11 08:42:31 +08:00
DrKLO
7ba9838a2d Update to 7.6.1 (2274) 2021-04-09 16:17:32 +03:00
luvletter2333
b47167982a
Fix: reset port in recreate socket 2021-03-31 14:46:07 +08:00
luvletter2333
61243e461b
Fix port show in log 2021-03-31 14:46:07 +08:00
luvletter2333
9ad38d5956
Fix ipv6 proxy when using resolved address from domain 2021-03-31 14:44:08 +08:00
luvletter2333
770715234c
Set longer timeout 2021-03-28 00:39:04 +08:00
luvletter2333
7e876b20e3
IPv6 MTProxy support 2021-03-27 22:40:18 +08:00