8224 Commits

Author SHA1 Message Date
andrew
bfd2370730 Add disabled group options 2023-08-28 09:37:19 +09:30
andrew
9f6dd728d5 Cleanup 2023-08-28 01:50:20 +09:30
andrew
c22860665e Add event flow 2023-08-27 23:20:14 +09:30
andrew
b65a383ac5 Reinstate group footer 2023-08-27 18:44:29 +09:30
andrew
97f28fd2e5 Respect option selected in note to self 2023-08-27 01:24:41 +09:30
andrew
6602f1bd14 Show correct options for note to self 2023-08-27 01:14:39 +09:30
andrew
cc5cd51ac1 Fix type radio button 2023-08-27 01:03:36 +09:30
andrew
7a705642a2 Fix fading edge 2023-08-27 00:12:20 +09:30
andrew
71b2544c31 Use compose 2023-08-25 12:20:34 +09:30
andrew
5142c45643 Move recipient into state 2023-08-24 01:00:31 +09:30
andrew
0ed9731622 Make ExpiryMode non-null in config 2023-08-24 00:32:24 +09:30
andrew
58b5815a09 Simplify 2023-08-22 14:12:11 +09:30
andrew
621c74c1d6 Improve animations 2023-08-22 10:58:06 +09:30
andrew
6818be21a1 Remove trailing divider 2023-08-21 20:58:51 +09:30
andrew
d9c48ec84f Move getDeleteOptions() to ViewModel 2023-08-21 20:00:39 +09:30
andrew
78eef350b5 Add radioOption DSL 2023-08-21 19:45:50 +09:30
andrew
9123dd90a4 Utilise typealias for RadioOptions 2023-08-21 18:35:37 +09:30
andrew
60f396a158 Fix ExpSettingsViewModel 2023-08-21 12:11:27 +09:30
0x330a
d6dd7a82f1 fix: error with legacy type and set type check 2023-08-16 16:25:25 +10:00
0x330a
9faa400a5b
refactor: use generic option adapters, fix compile issues 2023-08-10 17:16:46 +10:00
0x330a
317ecf6cee refactor: making radio options and adapter and list items generic 2023-08-09 16:36:19 +10:00
0x330a
9dc8f18b86 fix: prevent message request response from being deleted by any config 2023-08-09 10:59:57 +10:00
0x330a
2e3d50364c fix: issue for overwriting local config with an outdated user config merge 2023-08-04 16:11:18 +10:00
0x330a
8db92cc55c
feat: add user config integrated into config sync 2023-08-03 17:37:21 +10:00
0x330a
06c0ab3080 refactor: let frontend use the normal types and enabled options properly set 2023-08-03 08:54:39 +10:00
0x330a
bcb2071f44
fix: compile issues and dependencies resolved to use shared configs throughout apps 2023-07-31 17:19:38 +10:00
0x330a
19083e2ce7 refactor: use the shared config expiry mode types instead of custom protobufs so we can remove a variable and simplify checks across two variables 2023-07-28 11:39:12 +10:00
0x330a
7f4db64a5a
refactor: refactor ExpirationConfigurationDatabase to return a specific db config after removing config values that are in shared lib 2023-07-27 17:40:59 +10:00
0x330a
87d76b21da
refactor: moving radio indexes out of expiration configuration 2023-07-27 14:22:10 +10:00
0x330a
0e30d14b96
refactor: start looking at how to incorporate the user config changes to the expiry message update times and where to read values from 2023-07-26 17:16:09 +10:00
0x330a
6998ae7c88
fix: use the env->IsSameObject function correctly checking class types 2023-07-26 14:42:30 +10:00
0x330a
2acb7b5169 refactor: remove unused parameter 2023-07-26 11:57:26 +10:00
0x330a
41c05b1e67 fix: compile issues and deprecate java for kotlin lint 2023-07-26 11:34:00 +10:00
0x330a
7f7971e47f Merge remote-tracking branch 'upstream/dev' into disappearing-messages
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/res/layout/activity_conversation_v2_action_bar.xml
2023-07-26 09:46:57 +10:00
0x330a
57d43270a8 fix: compile issues 2023-07-25 17:15:54 +10:00
0x330a
6bd970c869 build: rebuild protos 2023-07-25 13:31:12 +10:00
0x330a
36df2b37df Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
2023-07-25 13:14:29 +10:00
Andrew
d39cf2754c
[SES-557] Update MessageDetailActivity with Compose 2023-07-21 12:17:52 +09:30
andrew
fbb2172739 Fix buttons 2023-07-21 11:50:42 +09:30
andrew
d0415c5bf1 Merge branch 'dev' into comp 2023-07-21 10:42:13 +09:30
Andrew
9af6dc9265
[SES-205] Fix message clipping 2023-07-20 14:02:31 +09:30
andrew
fc8a92998c Fix message clipping 2023-07-19 15:04:30 +09:30
0x330a
68248db83c fix: compile errors to build 2023-07-19 10:28:52 +10:00
0x330a
74ee433eec fix: more merge conflict compile issues 2023-07-19 00:02:43 +10:00
andrew
452db6dfa3 Make reply safer 2023-07-18 13:36:08 +09:30
andrew
9a84f6c67b Merge branch 'dev' into comp 2023-07-18 12:04:56 +09:30
0x330a
07e1d80654 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/menus/ConversationMenuHelper.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
#	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/dependencies/DatabaseComponent.kt
#	app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt
#	app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
#	app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
#	app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
#	app/src/main/res/layout/activity_conversation_v2.xml
#	libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
#	libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt
#	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/snode/SnodeAPI.kt
#	libsignal/protobuf/SignalService.proto
#	libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt
2023-07-18 11:39:03 +10:00
hjubb
1bb3939930 Merge branch 'dev' 1.17.0 2023-07-14 18:47:39 +10:00
hjubb
e7608763a0 fix: tests pass with forcing config 2023-07-14 18:47:10 +10:00
hjubb
d4ab49ebbb build: submodule build command update 2023-07-14 18:31:25 +10:00