世界 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
..
ApiScheme.cpp	Update to 7.7.0 (2284)	2021-04-14 04:44:46 +03:00
ApiScheme.h	Update to 7.7.0 (2284)	2021-04-14 04:44:46 +03:00
BuffersStorage.cpp	Update to 5.6.1	2019-05-14 15:08:05 +03:00
BuffersStorage.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
ByteArray.cpp	Update to 5.2.1	2019-01-23 20:03:33 +03:00
ByteArray.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
ByteStream.cpp	Update to 5.11.0	2019-09-10 13:56:11 +03:00
ByteStream.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
Config.cpp	Update to 5.2.1	2019-01-23 20:03:33 +03:00
Config.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
Connection.cpp	Increase proxy timeout	2021-04-11 08:42:31 +08:00
Connection.h	Update to 5.10.0	2019-08-22 01:53:26 +02:00
ConnectionSession.cpp	Update to 5.2.1	2019-01-23 20:03:33 +03:00
ConnectionSession.h	Update to 5.2.1	2019-01-23 20:03:33 +03:00
ConnectionsManager.cpp	Merge upstream 7.7.0 (2284)	2021-04-14 10:15:57 +08:00
ConnectionsManager.h	Merge upstream 7.7.0 (2284)	2021-04-14 10:15:57 +08:00
ConnectionSocket.cpp	Fix: reset port in recreate socket	2021-03-31 14:46:07 +08:00
ConnectionSocket.h	Update to 5.13.1 (1827)	2020-01-05 14:50:11 +03:00
Datacenter.cpp	Update to 7.6.0 (2264)	2021-03-19 13:25:58 +03:00
Datacenter.h	Remove custom server	2021-01-12 10:57:16 +08:00
Defines.h	Merge upstream 7.6.0 (2264)	2021-03-19 19:42:32 +08:00
EventObject.cpp	Update to 4.9.0	2018-07-30 09:07:02 +07:00
EventObject.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
FileLog.cpp	Update to 5.2.1	2019-01-23 20:03:33 +03:00
FileLog.h	Update to 5.2.1	2019-01-23 20:03:33 +03:00
Handshake.cpp	Merge upstream 7.6.0 (2264)	2021-03-19 19:42:32 +08:00
Handshake.h	Remove custom server	2021-01-12 10:57:16 +08:00
MTProtoScheme.cpp	Update to 5.10.0	2019-08-22 01:53:26 +02:00
MTProtoScheme.h	Update to 6.1.0 (1938)	2020-04-24 12:21:58 +03:00
NativeByteBuffer.cpp	Update to 5.2.1	2019-01-23 20:03:33 +03:00
NativeByteBuffer.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
ProxyCheckInfo.cpp	Update to 4.9.0	2018-07-30 09:07:02 +07:00
ProxyCheckInfo.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
Request.cpp	Update to 7.6.0 (2264)	2021-03-19 13:25:58 +03:00
Request.h	Update to 7.6.0 (2264)	2021-03-19 13:25:58 +03:00
Timer.cpp	Update to 5.2.1	2019-01-23 20:03:33 +03:00
Timer.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00
TLObject.cpp	Update to 4.9.0	2018-07-30 09:07:02 +07:00
TLObject.h	Update to 4.9.0	2018-07-30 09:07:02 +07:00