8747 Commits

Author SHA1 Message Date
andrew
bcf925c132 Cleanup 2023-08-06 22:22:39 +09:30
0x330a
2e3d50364c fix: issue for overwriting local config with an outdated user config merge 2023-08-04 16:11:18 +10:00
andrew
a27f81db30 Fix Huawei push notifications 2023-08-04 13:36:09 +09:30
0x330a
8db92cc55c
feat: add user config integrated into config sync 2023-08-03 17:37:21 +10:00
andrew
cc6f880665 ... 2023-08-03 14:14:55 +09:30
0x330a
06c0ab3080 refactor: let frontend use the normal types and enabled options properly set 2023-08-03 08:54:39 +10:00
andrew
41d24ef2c3 ... 2023-08-02 14:55:31 +09:30
andrew
7ee9b14247 Fix PNModeActivity DI 2023-08-02 10:41:50 +09:30
Andrew
cd1a52399e Increase activity_home_outdated_client_config text size to 11sp 2023-07-31 22:18:34 +09:30
Andrew
b487d5aa64 Hide sender prefix for control messages 2023-07-31 19:48:45 +09:30
Andrew
dd345cbf07 Hide sender prefix for note to self 2023-07-31 19:40:20 +09:30
0x330a
bcb2071f44
fix: compile issues and dependencies resolved to use shared configs throughout apps 2023-07-31 17:19:38 +10:00
andrew
916f705c50 Prefix message with name in HomeActivity 2023-07-31 14:44:43 +09:30
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
andrew
d1e22ca369 Fix 2023-07-27 13:53:33 +09:30
0x330a
87d76b21da
refactor: moving radio indexes out of expiration configuration 2023-07-27 14:22:10 +10:00
andrew
7be1f092f9 More Huawei stuff 2023-07-26 22:09:24 +09:30
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
andrew
4738c9b4f9 Fix v2 2023-07-26 14:48:15 +09:30
andrew
d3ea4e2e30 Fix 2023-07-26 14:36:06 +09:30
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
Andrew
55216875ac Connect Huawei push notifications 2023-07-26 10:48:20 +09:30
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
andrew
34990b13d3 ... 2023-07-25 14:49:41 +09:30
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
01e9d15872 Add Huawei flavor 2023-07-25 11:38:06 +09:30
andrew
58cda9ba4a Fix website 2023-07-25 10:32:41 +09:30
andrew
002793baed Merge branch 'dev' into add-unregister 2023-07-24 09:52:11 +09:30
andrew
41cb4656d8 M:erge branch 'dev' into fix-pro 2023-07-21 15:50:59 +09:30
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
fbf448f889
[SES-206, SES-359] Enable reply with voice and fix layout 2023-07-20 14:01:12 +09:30
andrew
b25f0e6d27 Move voice below quote in message view 2023-07-20 13:22:52 +09:30
andrew
47d1c657f3 Enable reply with attachment 2023-07-20 13:21:58 +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