Commit Graph

86 Commits

Author SHA1 Message Date
luvletter2333 7474cd9718
Merge official 8.4.1 & 8.4.2 2022-01-01 02:10:02 +08:00
xaxtix 9e740dfd4d Update to 8.4.1 2021-12-30 13:52:40 +03:00
luvletter2333 d938d7ff9b
Merge official 8.3.0 2021-12-08 20:33:55 +08:00
xaxtix 64c32ace43 Update to 8.3.0 2021-12-07 16:02:02 +03:00
arm64v8a 6d4984b864 Refine public proxy 2021-12-03 21:24:28 +08:00
arm64v8a 4a12bad17c add more restart tips 2021-11-12 22:15:13 +08:00
arm64v8a 55edb6bde4 Allow loading custom emoji 2021-11-11 22:13:00 +08:00
arm64v8a e1098169b6 Merge remote-tracking branch 'tg/master' into dev 2021-11-05 22:11:49 +08:00
xaxtix 1d379b9a7b Update to 8.2.1 (2462) 2021-11-05 13:06:49 +03: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
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 3cb50b03be
fix translator when using internal proxy 2021-08-28 23:54:09 +08: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
世界 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
luvletter2333 64b9d411cb
Fix: invoke virtual method on null object when toggling WS proxy too fast 2021-04-18 01:34:47 +08: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
世界 5d88b7c83e
Increase proxy timeout 2021-04-11 08:42:31 +08:00
世界 3562aad367
Fix missing lollipop requirement 2021-04-11 02:51:50 +08:00
世界 95c574f012
OSS WebSocket relay implementation 2021-04-11 00:24:54 +08:00
DrKLO 7ba9838a2d Update to 7.6.1 (2274) 2021-04-09 16:17:32 +03:00
世界 cadc7b5758
Fix external proxy not stop after disable 2021-03-27 19:53:51 +08:00
世界 be7a415a03
Merge upstream 7.6.0 (2264) 2021-03-19 19:42:32 +08:00
DrKLO ca13bc972d Update to 7.6.0 (2264) 2021-03-19 13:25:58 +03:00
世界 81d0af640f
Fixes and improvements 2021-03-18 15:58:55 +08:00
世界 4ef352adfd
Fix accounts 2021-03-13 21:13:04 +08:00
世界 c8a61434fa
Fix accounts recovery 2021-03-13 14:23:29 +08:00
世界 2fc53585d9
Fix build 2021-03-13 03:52:00 +08:00
世界 9c10d75bdf
Fix SharedConfig 2021-03-13 03:52:00 +08:00
世界 b30bc1ed80
Unlimited accounts 2021-03-13 03:52:00 +08:00
世界 7f8ca21868
Refine accounts 2021-03-13 03:51:59 +08:00
世界 94d985c679
Fixes 2021-02-17 11:12:28 +08:00
世界 e954b7fd2e
Fix some crash in provider 2021-02-13 11:34:40 +08:00
世界 932b17b1b2
Merge upstream 7.3.1 (2206) 2021-01-01 23:30:19 +08:00
DrKLO d52de1a40a Update to 7.3.1 (2206) 2021-01-01 08:38:45 +04:00
世界 287f1bd018
Revert "Migrate to nitrite 4"
This reverts commit 6580fcbd
2020-12-29 22:40:15 +08:00
世界 b34f56582b
Merge upstream 7.3.1 (2199) 2020-12-26 13:36:11 +08:00
DrKLO d0e2266da1 Update to 7.3.1 (2199) 2020-12-26 09:18:43 +04:00
世界 6580fcbd1f
Migrate to nitrite 4 2020-12-24 21:56:50 +08:00
世界 232f2de3d1
Minor fixes 2020-12-24 02:00:15 +08:00
世界 eb91f02681
Fixes 2020-12-23 18:52:32 +08:00