Commit Graph

8094 Commits

Author SHA1 Message Date
0x330a
4c9a237d87
fix: compile errors 2023-07-06 14:48:05 +10:00
0x330a
325abe020a Merge remote-tracking branch 'upstream/dev' into disappearing-messages
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
#	app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
#	app/src/main/res/layout/activity_conversation_v2_action_bar.xml
#	app/src/main/res/layout/expiration_dialog.xml
#	app/src/main/res/menu/menu_conversation_expiration.xml
#	app/src/main/res/menu/menu_conversation_expiration_on.xml
#	app/src/main/res/values/strings.xml
#	libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java
#	libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java
#	libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.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
#	libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
#	libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
2023-07-05 22:27:59 +10:00
Andrew
7da3e4f022
Fix blocked contacts button (#1264) 2023-07-04 11:39:49 +09:30
Stefan Junker
ba4143c298
feat: increase voice recording limit to 5m (#1201) 2023-07-03 11:43:02 +10:00
Andrew
c039eb89bc
Fix debug screen security default (#1256) 2023-06-30 10:05:32 +09:30
Andrew
b9f24bc4bd
Add button downstates to appearance settings screen (#1224) 2023-06-20 12:04:24 +09:30
Andrew
92a6447b8a
Add button downstates throughout (#1220) 2023-06-19 11:51:14 +09:30
Andrew
cc015c45bd
Add 50 dp buffer to isScrolledToBottom (#1228) 2023-06-14 10:34:49 +09:30
Morgan Pretty
f0486061b1 build: increment build number 2023-06-08 17:38:52 +10:00
Morgan Pretty
026b994664
Merge pull request #1238 from oxen-io/fix/modal-backgrounds
Fix broken modal styling from 1.16.8
2023-06-08 17:31:27 +10:00
Morgan Pretty
a957e78aac
Merge pull request #1241 from mpretty-cyro/fix/open-group-polling-bugs
Fixed a few issues with the OpenGroupPoller
2023-06-08 16:53:40 +10:00
Morgan Pretty
80104f6db8 [SES-627] Fixed an issue where the DocumentView could run off the screen 2023-06-08 16:33:34 +10:00
Morgan Pretty
7699e47f7b Responded to PR comments 2023-06-07 15:02:32 +10:00
Morgan Pretty
11c1fd382d Fixed a few issues with the OpenGroupPoller
Fixed an issue where the admin/moderator status wasn't getting stored if set before joining a community
Fixed an issue where multiple pollers for the same server could run at the same time when joining multiple rooms within the same app run (very noticeable when restoring/linking)
2023-06-07 13:31:22 +10:00
Morgan Pretty
22a30f1907 Fixed the MediaSendFragment progress dialog 2023-06-06 18:29:02 +10:00
Morgan Pretty
082c087105 Added the custom dialog windowBackground back (fix permission dialogs) 2023-06-06 17:30:10 +10:00
Morgan Pretty
9ce89087a5 Updated the dialog dim amount to match the style guide 2023-06-06 16:57:27 +10:00
Morgan Pretty
cea65f3e45 Fixed an issue where a bunch of dialog backgrounds were missing 2023-06-06 16:34:23 +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
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
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
Andrew
1b231bfff3
Fix dialog button style (#1214) 2023-05-24 13:06:26 +09:30