Morgan Pretty
|
796fdc6d1b
|
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/database/RecipientDatabase.java
# app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
# app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
# libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
|
2023-05-31 14:48:46 +10:00 |
|
Morgan Pretty
|
9b7fb3dd86
|
Removed the JobDatabase since it's no longer used
|
2023-05-30 13:31:36 +10:00 |
|
Morgan Pretty
|
8ce6e997aa
|
Fixed a potential crash after changing a property to be nullable
|
2023-05-30 12:50:51 +10:00 |
|
Morgan Pretty
|
b7744f4f2d
|
Addressed PR feedback
|
2023-05-30 12:43:51 +10:00 |
|
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 |
|
0x330a
|
1c7841333a
|
fix: add max size and maybe fix the non-200 sub requests for batches (for 421s in particular)
|
2023-05-25 13:24:24 +10:00 |
|
Andrew
|
5519f17775
|
Truncate session id when displayed as username (#1215)
|
2023-05-25 10:58:52 +09:30 |
|
Andrew
|
7d31af9eb0
|
Fix isScrolledToBottom (#1217)
|
2023-05-25 10:57:05 +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
|
bd81869f9a
|
refactor: more test code refactor
|
2023-05-23 17:55:41 +10:00 |
|
0x330a
|
69a2169733
|
feat: add a dump in there as well
|
2023-05-23 17:50:15 +10:00 |
|
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 |
|
0x330a
|
1a3f432f85
|
refactor: re-add the sending of configs
|
2023-05-22 15:51:05 +10:00 |
|
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 |
|