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
|
8d66d948ca
|
Polish
|
2023-07-04 22:10:48 +09:30 |
|
andrew
|
d6b1440217
|
Refactor MessageDetailsViewModel
|
2023-07-04 15:27:00 +09:30 |
|
andrew
|
7cd2bd0e0d
|
Cleanup
|
2023-07-04 15:11:40 +09:30 |
|
andrew
|
6209ae68a8
|
Cleanup
|
2023-07-04 14:56:35 +09:30 |
|
andrew
|
ee0141f82d
|
Refactor to Components
|
2023-07-04 14:09:40 +09:30 |
|
andrew
|
f82ed7718d
|
Cleanup CarouselButton
|
2023-07-04 13:26:26 +09:30 |
|
Andrew
|
7da3e4f022
|
Fix blocked contacts button (#1264)
|
2023-07-04 11:39:49 +09:30 |
|
andrew
|
26aed783e8
|
Fix Divider padding
|
2023-07-04 11:34:20 +09:30 |
|
andrew
|
6890f5c448
|
Add image click listener
|
2023-07-04 09:31:14 +09:30 |
|
andrew
|
d719660030
|
Add expand button
|
2023-07-03 21:25:59 +09:30 |
|
andrew
|
0fcd997290
|
Fix divider color
|
2023-07-03 20:40:16 +09:30 |
|
andrew
|
70e63a23bc
|
Fix indicator colors
|
2023-07-03 20:12:23 +09:30 |
|
andrew
|
0ec93e4b36
|
Refactor CarouselButtons
|
2023-07-03 18:30:15 +09:30 |
|
andrew
|
1d29b5465f
|
Refactor prev and next buttons
|
2023-07-03 17:41:30 +09:30 |
|
andrew
|
db4ff94084
|
Add prev and next buttons to carousel
|
2023-07-03 17:19:33 +09:30 |
|
andrew
|
1902d4755c
|
Add pager indicator
|
2023-07-03 13:00:11 +09:30 |
|
Stefan Junker
|
ba4143c298
|
feat: increase voice recording limit to 5m (#1201)
|
2023-07-03 11:43:02 +10:00 |
|
andrew
|
1303979cdf
|
Add image attachments
|
2023-07-03 10:35:50 +09:30 |
|
andrew
|
4decce9dde
|
Add images
|
2023-07-01 17:41:33 +09:30 |
|
andrew
|
d44dbe089f
|
Wire up buttons
|
2023-06-30 22:49:23 +09:30 |
|
andrew
|
351b259449
|
Add error
|
2023-06-30 13:25:16 +09:30 |
|
andrew
|
19b2c5ef97
|
Fix LiveDataTestUtil
|
2023-06-30 12:32:56 +09:30 |
|
andrew
|
f68c01b2ee
|
Populate profile pic
|
2023-06-30 11:35:22 +09:30 |
|
andrew
|
92fae3d6bf
|
Add ProfilePictureView to MessageDetailActivity
|
2023-06-30 11:07:27 +09:30 |
|
andrew
|
876e12c411
|
Refactor ProfilePictureView
|
2023-06-30 11:01:57 +09:30 |
|
andrew
|
6d596226b3
|
Add user info
|
2023-06-30 10:33:56 +09:30 |
|
Andrew
|
c039eb89bc
|
Fix debug screen security default (#1256)
|
2023-06-30 10:05:32 +09:30 |
|
andrew
|
676c29ca60
|
Add click listeners
|
2023-06-30 09:48:48 +09:30 |
|
andrew
|
ac476f4382
|
Add icons and respect nullability
|
2023-06-29 22:11:15 +09:30 |
|
andrew
|
d5b3d9bcf9
|
Improve theming
|
2023-06-29 19:14:47 +09:30 |
|
andrew
|
0c2682fe47
|
Improve compose theming
|
2023-06-29 17:11:11 +09:30 |
|
andrew
|
fc108b34db
|
Create Message Details screen
|
2023-06-29 11:37:55 +09:30 |
|
andrew
|
ab8b2c42b9
|
Add jetpack compose
|
2023-06-28 10:34:48 +09:30 |
|
andrew
|
97297508f4
|
Simplify ExpirationDialog
|
2023-06-26 10:58:08 +09:30 |
|
andrew
|
20eac67761
|
simplify
|
2023-06-23 13:01:11 +09:30 |
|
andrew
|
4ee8dc712e
|
Fix + button in rationale dialog
|
2023-06-23 11:42:19 +09:30 |
|
andrew
|
b46b52ace4
|
Merge branch 'dev' into utilise-dialog-dsl
|
2023-06-23 11:14:27 +09:30 |
|
andrew
|
8be088ad56
|
Reinstate v1 PNServerJob
|
2023-06-23 10:29:49 +09:30 |
|
andrew
|
dc7602a1d3
|
Check fcm is enabled before modifying group sub
|
2023-06-21 12:37:10 +09:30 |
|
andrew
|
e3f60eb5f2
|
Fix individual group subs
|
2023-06-21 10:32:29 +09:30 |
|
andrew
|
42cfce0c3e
|
Refactor v1 and v2
|
2023-06-21 10:01:35 +09:30 |
|
andrew
|
0e0ab9151e
|
cleanup
|
2023-06-20 22:34:10 +09:30 |
|
andrew
|
5c9dc36460
|
Merge branch 'dev' into add-unregister
|
2023-06-20 12:31:37 +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
|
667af27bfb
|
Utilise TokenManager and ExpiryManager
|
2023-06-16 10:45:38 +09:30 |
|
andrew
|
153aa4ceaa
|
Reinstate push v1
|
2023-06-14 18:46:28 +09:30 |
|
andrew
|
440a5a942d
|
Merge branch 'dev' into utilise-dialog-dsl
|
2023-06-14 11:03:27 +09:30 |
|
Andrew
|
cc015c45bd
|
Add 50 dp buffer to isScrolledToBottom (#1228)
|
2023-06-14 10:34:49 +09:30 |
|