Commit Graph

1678 Commits

Author SHA1 Message Date
Morgan Pretty
c77d465438 Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
#	app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt
2023-05-30 12:25:13 +10:00
Morgan Pretty
0c2a635d03 Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash 2023-05-30 12:24:32 +10:00
Morgan Pretty
10af2815ac
Merge pull request #1176 from bemusementpark/sync-everything
Synchronize usage of Cipher
2023-05-30 12:22:28 +10:00
Andrew
e8d26222b9
Fix scroll to bottom button visibility (#1219) 2023-05-30 11:44:20 +09:30
andrew
0af713317a Merge branch 'dev' into sync-everything 2023-05-30 11:34:34 +09:30
Morgan Pretty
22ed2dd8aa
Merge pull request #1205 from bemusementpark/disable-unblock
Disable unblock button
2023-05-30 10:30:51 +10:00
Morgan Pretty
d541f395a5
Merge pull request #1213 from bemusementpark/fix-id-divider-color
Fix ID divider color
2023-05-30 10:29:57 +10:00
0x330a
9a7d3a45d7 Merge remote-tracking branch 'upstream/dev' into libsession-integration
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
2023-05-26 16:04:19 +10:00
0x330a
dec179f4e7
fix: open group comparison issues potentially, have to update some more outgoing message open group flags for visibility of details etc 2023-05-25 17:51:30 +10:00
Andrew
5519f17775
Truncate session id when displayed as username (#1215) 2023-05-25 10:58:52 +09:30
Andrew
331d523c45
Improve notification content dialog (#1211) 2023-05-24 18:03:27 +09:30
Andrew
47d5b242ca
Fix share button color (#1212) 2023-05-24 18:00:32 +09:30
0x330a
78d1e9d387
fix: open group threads and avatar downloads 2023-05-24 17:34:27 +10:00
0x330a
c5299c1010
fix: update last seen if later than current 2023-05-24 14:12:49 +10:00
Andrew
1b231bfff3
Fix dialog button style (#1214) 2023-05-24 13:06:26 +09:30
Andrew
945df19aef
Fix radio button selection transition (#1209) 2023-05-24 11:23:57 +09:30
Andrew
95a165aa05
Fix TabLayout ripple (#1210) 2023-05-24 11:23:19 +09:30
andrew
55dd62240a Fix size & space 2023-05-23 18:49:28 +09:30
andrew
ff124b8edc Fix ID divider color 2023-05-23 18:41:04 +09:30
0x330a
01fef6a0a4
feat: add a wrapper hash to track home diff util changes for wrapper contact recipient info, add test for dirty state in double set 2023-05-23 17:46:54 +10:00
0x330a
1781d7e85f
fix: open group avatar loop for open groups we have left 2023-05-23 15:30:40 +10:00
andrew
a295dfb248 Cleanup 2023-05-23 14:56:03 +09:30
0x330a
f91fc2503b
fix: nts threads 2023-05-23 14:56:37 +10:00
0x330a
4f534d5a1e
fix: force has sent for local user, only prevent setting last seen for open group recipients, allow empty user pics to trigger config sync in settings 2023-05-23 14:39:13 +10:00
0x330a
4cbf1bc337 feat: add logs and fix compile issue with a themes.xml entry, add removing profile picture into logic for profile manager 2023-05-23 12:07:09 +10:00
andrew
8b39c4e56a polish 2023-05-22 22:20:52 +09:30
andrew
76466e57de Fix ripple 2023-05-22 17:03:26 +09:30
0x330a
fb7dcf58ca
[wip]
fix: trying to consolidate prof pic and key properly
2023-05-22 17:30:15 +10:00
0x330a
6bb1ad2ca9
Merge remote-tracking branch 'upstream/dev' into libsession-integration
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
2023-05-22 17:23:14 +10:00
0x330a
34f40d01f3
fix: don't add contacts if they don't exist in the profile manager 2023-05-22 16:22:04 +10:00
andrew
4f2ef7f2af Add SelectableItem<> 2023-05-22 15:46:12 +09:30
andrew
8ef6ec2125 . 2023-05-22 14:57:36 +09:30
Andrew
d505109aa3
Merge branch 'dev' into disable-unblock 2023-05-22 14:55:55 +09:30
Andrew
a8e77659b3
Add remove avatar 2023-05-22 14:53:58 +09:30
Andrew
8f55ac93f8
Fix accept button color 2023-05-22 14:53:05 +09:30
Andrew
6fc7b3591e
Fix ripple color 2023-05-22 14:52:27 +09:30
0x330a
9c206bad64
feat: adding a force new configs flag and logic for timestamp handling / forced configs, fix issue with handling legacy messages 2023-05-22 14:59:03 +10:00
andrew
30d748e147 Disable unblock button 2023-05-19 23:44:07 +09:30
0x330a
371fb20b6e fix: added more migration code for deleting unnecessary threads and groups, fixed a post-migration last seen issue on last item (current read is now), comment out actual network sync while testing migrations 2023-05-19 20:01:50 +10:00
andrew
235b94a905 Fix ripple color 2023-05-18 19:20:44 +09:30
Andrew
f64fe4b652
Fix device notification settings preference color 2023-05-17 22:34:46 +09:30
andrew
8c5ff1f944 Fix dialog button color 2023-05-17 14:50:20 +09:30
andrew
a334b8912a Fix device notification settings preference color 2023-05-17 14:39:47 +09:30
0x330a
7ed12ce87d
fix: handle recyclerview scrolled on scroll to first unread if it's the first load 2023-05-17 13:28:12 +10:00
0x330a
f7b8a90edb
fix: some compile issues in tests and some TODOs for things to do before merge 2023-05-17 11:58:47 +10:00
0x330a
cf171fc371 feat: update libsession-util, adjust docs, update mms and sms to use message sent timestamp instead of -1 for last read in the thread 2023-05-16 12:09:28 +10:00
0x330a
dcbe548891
fix: self sync sync message failures for default values 2023-05-15 15:03:44 +10:00
0x330a
9646ea580f
fix: prevent block of users in delete all 2023-05-15 11:44:11 +10:00
0x330a
8f51304ec1
refactor: use just first visible instead of completely visible, merge message sender changes 2023-05-12 17:23:48 +10:00
0x330a
7647531146
Merge remote-tracking branch 'origin/libsession-integration' into libsession-integration 2023-05-12 16:29:47 +10:00
0x330a
42dbd11255
Merge remote-tracking branch 'upstream/dev' into libsession-integration
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
2023-05-12 16:29:26 +10:00
0x330a
2b096019d6 refactor: remove populate public key cache if needed call which seems unnecessary at that point, maybe UserView refs have changed since 2020 2023-05-12 11:32:09 +10:00
0x330a
da330273c8 fix: prevent NTS self create thread on user view bind 2023-05-12 11:30:15 +10:00
0x330a
b2439d48ee refactor: let the user display name return "You" for local user 2023-05-12 11:26:00 +10:00
Andrew
ab3caf8ab5
Fix message entrance coordinates 2023-05-12 09:44:14 +09:30
Andrew
44cb8fec2c
Remove reply from context menu when you can't write 2023-05-11 22:59:53 +09:30
Andrew
e6dc5f2128
Fix links not working when message is partially offscreen 2023-05-11 22:58:12 +09:30
Andrew
fef2948f58
Fix scroll to bottom button position when input not visible 2023-05-11 22:57:08 +09:30
Andrew
57476cd56e
Fix scroll to bottom button always visible if last item is taller than RecyclerView 2023-05-11 19:48:10 +09:30
Andrew
ba9dab33c5
Synchronize Cipher in KeystoreHelper 2023-05-11 19:47:49 +09:30
Andrew
aadba75038
Add sync status message 2023-05-11 19:46:09 +09:30
Andrew
84004d2fdb
Swallow exceptions in ScreenshotObserver 2023-05-11 19:45:43 +09:30
Andrew
910ab8874e
Remove laid out check before drawToBitmap 2023-05-11 19:45:10 +09:30
0x330a
5a2dac38c6
refactor: disable edit text for non contacts 2023-05-11 17:43:55 +10:00
0x330a
ad09888c80
feat: add block to the delete all message requests, only if they're not open group inbox contacts 2023-05-11 13:40:35 +10:00
ryanzhao
a7e0bd5366 Merge branch 'dev' into bluetooth-manager-crash 2023-05-11 12:16:52 +10:00
ryanzhao
88e788a406 clean 2023-05-11 12:16:37 +10:00
0x330a
f747f8e863
fix: pinning groups and notifying list listeners in threadDb.setPinned 2023-05-11 11:00:20 +10:00
0x330a
7d32edb133
Merge remote-tracking branch 'origin/libsession-integration' into libsession-integration
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
2023-05-11 10:46:46 +10:00
0x330a
14eb04adcb
Merge remote-tracking branch 'upstream/dev' into libsession-integration
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
2023-05-11 10:29:13 +10:00
Andrew
8dbabec4e7
Fix send after approval message (#1178)
* Fix send after approval message

* Fix logic

* Utilise isLocalNumber
2023-05-11 10:02:38 +10:00
Andrew
2b00729df3
Fix message request button overlap (#1188) 2023-05-11 10:01:05 +10:00
Andrew
ba3566f7e8
Fix approval text position when input bar is gone (#1181) 2023-05-11 10:00:39 +10:00
0x330a
82bffcbf2f refactor: merge changes, re-add the group check in unapproved messages 2023-05-10 17:30:29 +10:00
0x330a
4843d42643 Merge remote-tracking branch 'upstream/dev' into libsession-integration
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
2023-05-10 15:44:41 +10:00
ryanzhao
89545f0406 further clean up 2023-05-10 15:36:10 +10:00
0x330a
cd66901412 fix: don't set the read flag in update notifications, some roundabout logic for first loads and scrolling to last known positions 2023-05-10 12:46:30 +10:00
andrew
d20c27d6d3 Remove laid out check before drawToBitmap 2023-05-09 22:26:36 +09:30
andrew
4469d9754a Fix bubble entrance coordinates 2023-05-09 15:10:03 +09:30
andrew
c8fa2d8d6e Remove reply from context menu when you can't write 2023-05-09 14:51:28 +09:30
ryanzhao
fa71ea1850 make RetrieveProfileAvatarJob work 2023-05-09 14:14:49 +10:00
andrew
8d38d1c0fb Fix links not working when message is partially offscreen 2023-05-09 13:29:25 +09:30
Ryan Zhao
b494088c3d WIP: further refactor on old jobs 2023-05-08 17:12:20 +10:00
andrew
b6667b83ce Fix scroll to bottom button position when input not visible 2023-05-08 14:43:08 +09:30
andrew
f0715f16e0 Fix scroll to bottom button always visible if last item is taller than RecyclerView 2023-05-08 14:09:01 +09:30
0x330a
ebdfd2538d
refactor: remove some logging, don't use blinded conversations in the list 2023-05-08 13:24:35 +10:00
Ryan Zhao
2ceb9e2bf4 clean up old job manager 2023-05-08 12:29:21 +10:00
Ryan Zhao
2b48b52df0 remove unused jobs and wrap up old job refactoring 2023-05-08 11:18:33 +10:00
andrew
ec2abffdcc Remove logs 2023-05-08 10:33:39 +09:30
0x330a
d4f112e4b0 feat: use blinded message count for banner also 2023-05-08 09:18:10 +10:00
andrew
e9a15941ae Fix colors 2023-05-05 17:47:36 +09:30
ryanzhao
375815c719 WIP: refactor on jobs using old job table 2023-05-05 16:51:44 +10:00
0x330a
d4d4f81c36 fix: remove user notifications for leaving group to prevent synced device issues, don't create thread in messages for new closed groups, includei nactive groups in the deletion queries for merging group configs 2023-05-05 16:05:43 +10:00
andrew
6a5d97a0f0 Fix something 2023-05-05 12:37:46 +09:30
andrew
a9078c8d08 ...and the rest 2023-05-05 12:32:54 +09:30
andrew
a152250a60 Add comments 2023-05-05 12:18:39 +09:30
andrew
24741fcc22 Synchronize Cipher in KeystoreHelper 2023-05-05 12:10:46 +09:30
andrew
d3ce899a80 Synchronize all Cipher#doFinal 2023-05-05 12:07:19 +09:30
andrew
45eb3549f6 Add sync status message 2023-05-04 17:01:45 +09:30
ryanzhao
d868021f0a move job running status from database to memory 2023-05-04 15:30:09 +10:00