Commit Graph

8261 Commits

Author SHA1 Message Date
Morgan Pretty
cea65f3e45 Fixed an issue where a bunch of dialog backgrounds were missing 2023-06-06 16:34:23 +10:00
Morgan Pretty
f63ad7e034 Merge remote-tracking branch 'upstream/dev' into libsession-integration
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
#	app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt
#	libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
2023-06-06 15:44:24 +10:00
Morgan Pretty
6edf0d46f8 build: increment build number 2023-06-06 09:30:43 +10:00
Morgan Pretty
31608111b3 Merge remote-tracking branch 'upstream/master' into dev 2023-06-06 09:08:45 +10:00
Morgan Pretty
7f7ab63d15
Merge pull request #1164 from RyanRory/bluetooth-manager-crash
Fix crash & ANRs
2023-06-06 09:00:49 +10:00
Morgan Pretty
f1686ea260
Merge pull request #1236 from bemusementpark/fix-dialog-theme-background
Fix dialog theme to set windowColor and not background of every view
2023-06-06 08:53:40 +10:00
andrew
e5db7fc886 Fix dialog theme so it sets window color and not background of every child view 2023-06-05 19:15:42 +09:30
Morgan Pretty
9d5fa1239c Commented out the plus button on the replace profile modal 2023-06-05 17:15:05 +10:00
Morgan Pretty
346bdc1774 Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash 2023-06-05 16:05:20 +10:00
Morgan Pretty
6c14ed26e2
Merge pull request #1229 from bemusementpark/fix-long-message
[SES-571] Fix long message not visible on react
2023-06-05 16:04:52 +10:00
Morgan Pretty
f21100eff7 [SES-569] Merge branch 'fix-pic' into bluetooth-manager-crash 2023-06-05 16:02:11 +10:00
andrew
a6cfe5817d Change unset profile pic in dialog 2023-06-05 14:58:56 +09:30
Morgan Pretty
6b006b9d91
Merge pull request #1235 from bemusementpark/fix-colorControlHighlight
Fix back button background in light themes
2023-06-05 14:44:51 +10:00
Morgan Pretty
c92ef09d09 [SES-570] Fixed an issue where quotes weren't using their quoted message media 2023-06-05 14:31:41 +10:00
andrew
e99133fd8b Fix back button background in light themes 2023-06-05 13:13:49 +09:30
Morgan Pretty
1980113e41 [SES-566] Fixed an issue where the blocked state wasn't syncing 2023-06-05 09:39:31 +10:00
Morgan Pretty
2b7bd7417e [SES-567] Fixed a couple of issues where the Group poller would be stopped during creation 2023-06-02 17:00:20 +10:00
andrew
cbe90e7bfc Cleanup ConversationReactionOverlay 2023-06-02 15:46:28 +09:30
andrew
6d528d0e92 Fix long message not visible on react 2023-06-02 15:35:35 +09:30
Morgan Pretty
cbdcb4ffa1 Updated the code to ignore outdated legacy group control message changes 2023-06-02 15:35:08 +10:00
Morgan Pretty
ff7b7cd0b9 Fixed an issue where the group keyPair was getting encoded incorrectly 2023-06-02 15:32:31 +10:00
Morgan Pretty
6a4641bfce Replaced incorrect character in JNI 2023-06-01 15:56:58 +10:00
Morgan Pretty
3a035482e4 Added the legacy group 'joined_at' value 2023-06-01 15:25:58 +10:00
Morgan Pretty
422f53c86a Updated logic to delete legacy groups when kicked/left 2023-06-01 08:57:29 +10:00
Morgan Pretty
75fb714cbc Updated to the latest libSession-util 2023-05-31 15:23:55 +10:00
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