Commit graph

3927 commits

Author SHA1 Message Date
vivabelarus
99a5fd1450
Merge branch 'merge/4.1.2' into debug/fileprotection
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
2025-02-10 18:00:38 +03:00
vivabelarus
3a63872c39
Merge branch '4.1.2' into merge/4.1.2 2025-02-10 01:27:21 +03:00
vivabelarus
ee20c99d52
Update to 1566 2025-02-10 01:26:37 +03:00
vivabelarus
2417c6f0d5
Merge branch '4.1.2' into merge/4.1.2 2025-02-10 00:59:27 +03:00
vivabelarus
96394c011e
add logs 2025-02-10 00:56:59 +03:00
vivabelarus
c25ff4f9fe
fix SQLiteDatabaseWrapper 2025-02-10 00:29:34 +03:00
vivabelarus
e4f45d18ed
remove "cancel" button from "file protection disabled" dialog 2025-02-10 00:25:54 +03:00
vivabelarus
a5d37ed585
Merge branch '4.1.2' into merge/4.1.2 2025-02-09 22:22:17 +03:00
vivabelarus
3a50b4d72d
Update to 1565 2025-02-09 22:16:49 +03:00
vivabelarus
ed0d1e4634
fix encrypted group migration 2025-02-09 22:15:25 +03:00
vivabelarus
6af4e3b36e
fix and refactoring "delete my messages" 2025-02-09 20:12:43 +03:00
vivabelarus
25d19ca709
refactoring 2025-02-09 04:23:28 +03:00
vivabelarus
89d82d88c2
Merge branch '4.1.2' into merge/4.1.2 2025-02-08 23:09:49 +03:00
vivabelarus
01c64973e5
Update to 1564 2025-02-08 23:09:09 +03:00
vivabelarus
fba08c5481
Merge branch '4.1.2' into merge/4.1.2 2025-02-08 23:07:32 +03:00
vivabelarus
17af6998bb
fix showing "file protection is disabled" 2025-02-08 23:00:33 +03:00
vivabelarus
9ebc9f0f9a
fix databaseFileSizeExceedsMaximumForRam 2025-02-08 22:36:23 +03:00
vivabelarus
12ce338cb3
remove encrypted groups virtual message ids 2025-02-08 21:32:32 +03:00
vivabelarus
019f2026e2
improve out messages in secret groups 2025-02-08 18:06:30 +03:00
vivabelarus
be5eaad036
Merge branch '4.1.2' into merge/4.1.2
# Conflicts:
#	.github/workflows/alpha.yml
#	.github/workflows/beta.yml
#	TMessagesProj/src/main/java/org/telegram/messenger/partisan/PartisanVersion.java
2025-02-06 21:14:55 +03:00
vivabelarus
7b25df6b61
Update to 1563 2025-02-06 21:13:10 +03:00
vivabelarus
69f8dd6ef8
show file protection disabled dialog 2025-02-06 21:12:19 +03:00
vivabelarus
c115c125f7
remove fileProtectedDialogsLoaded 2025-02-06 18:13:49 +03:00
vivabelarus
9d132666a6
fix VACUUM sql exception 2025-02-06 16:14:01 +03:00
vivabelarus
0d217c8c83
fix "not all" in tester settings 2025-02-06 16:05:59 +03:00
vivabelarus
db6429759f
fix database migration 2025-02-05 23:44:18 +03:00
vivabelarus
6b163b4c1c
Update to 1562 2025-02-05 18:38:57 +03:00
vivabelarus
f9f51d25f8
fix merge 2025-02-05 18:32:11 +03:00
vivabelarus
7f9778e8bc
Merge remote-tracking branch 'upstream/master' into merge/4.1.2
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BirthdayController.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/SendMessagesHelper.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
#	TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCallUserCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ManageChatUserCell.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/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FolderBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/Premium/DoubledLimitsBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/Premium/boosts/UserSelectorBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/StorageDiagramView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
#	TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.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/SessionsActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
2025-02-05 17:48:13 +03:00
vivabelarus
cc421e4f6f
remove fileProtectedDialogsLoaded 2025-02-04 23:22:16 +03:00
vivabelarus
f3a66ab274
remove some logs 2025-02-04 23:21:53 +03:00
vivabelarus
987befcfb4
improve logs 2025-02-04 21:09:08 +03:00
vivabelarus
7d3510022f
Merge branch '4.1.2' into debug/fileprotection 2025-02-04 16:03:29 +03:00
vivabelarus
5b1ec6615d
Update to 1560 2025-02-04 16:03:12 +03:00
vivabelarus
be1e6bb64d
Merge branch '4.1.2' into debug/fileprotection 2025-02-04 16:02:40 +03:00
vivabelarus
bb7f67030d
clear database after file protection disabling 2025-02-04 16:02:01 +03:00
vivabelarus
1cd0b48802
Merge branch '4.1.2' into debug/fileprotection
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
2025-02-04 14:00:08 +03:00
vivabelarus
7983d512f3
fix dialogLoadOffsets with file protection 2025-02-04 13:58:07 +03:00
vivabelarus
b39616ba93
add logs 2025-02-04 13:52:01 +03:00
vivabelarus
ef875dbb13
fix crash 2025-02-03 13:18:08 +03:00
vivabelarus
f8d35efade
fix cutForeignAgentPart 2025-02-03 13:09:15 +03:00
vivabelarus
866e87b520
Update to 1559 2025-02-03 00:47:27 +03:00
vivabelarus
12c1ff3779
fix file protection dialogs loading 2025-02-03 00:46:57 +03:00
vivabelarus
12ded879d8
fix pinning encrypted groups 2025-02-03 00:44:16 +03:00
vivabelarus
1a03706bc2
add logs 2025-02-02 23:38:35 +03:00
vivabelarus
52528c3e1b
fix pinnedDebug 2025-02-02 22:54:10 +03:00
vivabelarus
d24532f2ea
fix file protection dialogs loading 2025-02-02 20:43:46 +03:00
vivabelarus
aabf4ef602
add pinnedDebug logs 2025-02-02 20:33:47 +03:00
vivabelarus
f4a9fbce12
fix logs 2025-02-02 17:12:20 +03:00
vivabelarus
b2b9b39f3f
Merge branch '4.1.2' into debug/fileprotection
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
2025-02-02 13:19:44 +03:00