Commit graph

265 commits

Author SHA1 Message Date
Harris ff853e01b4 fix: notifications deduplicate based on last message ID, ConversationActivityV2.kt updates notification by thread ID 2021-07-21 13:58:07 +10:00
Niels Andriesse 0131bc171a Warn users if they're about to send their recovery phrase to someone 2021-07-19 13:52:50 +10:00
ryanzhao 0933429175 Merge branch 'dev' of https://github.com/oxen-io/session-android into message-details 2021-07-14 13:52:24 +10:00
ryanzhao b092742447 reorganise duplicated resend code 2021-07-14 13:52:10 +10:00
Niels Andriesse a554aa574e Fix adapter position vs layout position usage 2021-07-14 09:37:18 +10:00
Ryan Zhao 51432a4655 Merge branch 'dev' of https://github.com/oxen-io/session-android into message-details 2021-07-13 16:22:19 +10:00
Ryan Zhao dc33e28826 re-introduce the message detail screen 2021-07-13 16:22:10 +10:00
Niels Andriesse a9e78ccf05
Merge pull request #656 from hjubb/chat_permission_resolution
Improve Permission Handling
2021-07-13 16:12:31 +10:00
jubb 393089ce23 fix: permission resolution in ConversationActivityV2.kt as well as rationale dialogs 2021-07-13 15:17:30 +10:00
Ryan Zhao 496d9683e3 Merge branch 'dev' of https://github.com/oxen-io/session-android into message-details 2021-07-13 14:43:50 +10:00
Ryan Zhao 0211239360 add message info item in menu 2021-07-13 14:42:16 +10:00
Niels Andriesse 6b7c7d1d2a Add support for new ban and delete all endpoint 2021-07-13 14:28:25 +10:00
jubb 9cb7d9ece8 fix: conversation activity now receives extra text shared via intent and accepts content shared by IME 2021-07-12 15:44:46 +10:00
jubb 842cfc25a1 Merge branch 'dev' into trusted_attachment_download
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
2021-07-12 09:28:14 +10:00
jubb 9dfd051e63 feat: trust dialog and processing attachments for users after trusting them 2021-07-09 15:13:43 +10:00
Niels Andriesse c984d90b04 Re-organize files 2021-07-09 13:18:48 +10:00
Niels Andriesse a9b5c269f6 Re-organize files & delete unused code 2021-07-09 11:14:21 +10:00
Niels Andriesse ecc7f50ac4 Fix open group deletion issue 2021-07-09 09:38:45 +10:00
Niels Andriesse 9fd2788664 Merge branch 'master' into dev 2021-07-09 09:25:16 +10:00
Niels Andriesse 004ea5b87a Fix various crashes 2021-07-09 09:24:43 +10:00
Niels Andriesse 183f013c31 Show date break header by hour instead of by day
Also ditch relative timestamps in favor of absolute ones
2021-07-08 13:37:08 +10:00
Ryan Zhao a1e63c5f8e auto play next audio 2021-07-08 10:24:10 +10:00
Ryan Zhao 69b05afbd9 Merge branch 'dev' of https://github.com/oxen-io/session-android into dev 2021-07-08 09:25:48 +10:00
Ryan Zhao f5835e1b54 WIP: auto play next voice message 2021-07-08 09:25:43 +10:00
Niels Andriesse 6ce37a6231 Remove unused code 2021-07-07 13:03:48 +10:00
jubb 8cc2f78da7 fix: audio durations set accordingly for send and receive and doesn't break saving / uploading by exhausting the input stream 2021-07-06 16:53:44 +10:00
jubb f66f305d76 fix: quote model uses own address if outgoing in the send to match the bind 2021-07-05 15:48:46 +10:00
jubb c153ea2acf Merge remote-tracking branch 'upstream/ui' into ui 2021-07-01 11:51:25 +10:00
jubb d98f34fa73 fix: only show loader if the message isn't failed, fix attachment upload and message send pending states in the conversation 2021-07-01 11:39:18 +10:00
Niels Andriesse 93a417d322 Fix closed group quote handling bug 2021-07-01 11:27:52 +10:00
jubb ab876ca9b8 fix: MessageSendJob.kt sets message as sending before calling send so conversation adapter doesn't display as error / let users retry while send job is pending 2021-07-01 11:20:31 +10:00
Niels Andriesse b7de9b36ad Fix expiration timer view positioning 2021-07-01 11:18:51 +10:00
jubb 7459765a52 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
2021-07-01 11:06:34 +10:00
jubb 758475f0dc fix: R.color.destructive on the error drawable in conversation and home adapter and handling message re-sending 2021-07-01 11:06:11 +10:00
Niels Andriesse 6aa4ad1cd0 Fix profile picture size issue 2021-07-01 10:02:02 +10:00
Niels Andriesse 0221784d60 Fix attachment sharing 2021-07-01 09:54:09 +10:00
Niels Andriesse 4cec9e684f Fix crash 2021-07-01 09:31:30 +10:00
ryanzhao 79fd74a157 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-30 14:55:30 +10:00
Niels Andriesse e91b84f694
Merge pull request #621 from hjubb/ui
Fix Body Text URL Handling & Open Group Media Previews
2021-06-30 14:47:04 +10:00
ryanzhao 956681f00a Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-30 14:40:00 +10:00
jubb b59b8b650d fix: links work properly now and the album navigates to open group messages now 2021-06-30 14:29:32 +10:00
Niels Andriesse 07de201fde Hide input if the user isn't part of a group 2021-06-30 14:05:30 +10:00
Niels Andriesse 1fbb3d3dd5 Fix message deletion threading bug 2021-06-30 13:49:23 +10:00
Niels Andriesse 4989bf4b8b Fix threading issue 2021-06-30 13:15:39 +10:00
ryanzhao ba1099d276 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-30 11:48:54 +10:00
ryanzhao 55ad96dcf7 hide search screen when long pressing 2021-06-30 11:44:26 +10:00
Niels Andriesse d3704a6905 Fix typing indicator overlaying recycler view 2021-06-30 11:02:46 +10:00
Niels Andriesse e147b3f5e9 React to mute & block status changes 2021-06-30 10:45:31 +10:00
Niels Andriesse bef7413055 Scroll to message upon tapping quote & fix various bugs 2021-06-30 10:30:10 +10:00
Ryan Zhao 19d683082e Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-29 16:15:25 +10:00
Niels Andriesse 7b7a9961da
Merge pull request #620 from hjubb/ui
Fix 421s, Fix NotifyPNServerJob Crash & Fix URL Handling
2021-06-29 16:13:36 +10:00
Ryan Zhao fa737a5b05 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-29 16:05:40 +10:00
jubb c5c8ebba04 fix: enable body texts to open modal URL dialog 2021-06-29 16:05:40 +10:00
Ryan Zhao 64a70d0555 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-29 16:03:10 +10:00
Niels Andriesse 1e39762eb1 Fix invisible attachment buttons being tappable 2021-06-29 16:01:02 +10:00
Niels Andriesse f1745448bb Hook up link preview suggestion dialog 2021-06-29 15:48:40 +10:00
Ryan Zhao 52305368bb scroll to the position of a search result 2021-06-29 15:35:53 +10:00
Niels Andriesse 05ac781b55 Fix crash & photo sending bug 2021-06-29 15:17:14 +10:00
Niels Andriesse dbedc5039a Implement image quoting 2021-06-29 14:05:32 +10:00
Ryan Zhao 628477f2fd link event listener 2021-06-29 14:00:47 +10:00
Niels Andriesse 8f2f1a47fd
Merge branch 'ui' into ui 2021-06-29 13:37:11 +10:00
Ryan Zhao 61ff68b532 add search bottom bar ui 2021-06-29 11:49:10 +10:00
Niels Andriesse 8d45efde4d Implement more option menu actions 2021-06-29 11:14:58 +10:00
Niels Andriesse 05cfb0dfd9 Implement various option menu actions 2021-06-29 10:39:00 +10:00
jubb 482d6a2075 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
2021-06-29 10:31:52 +10:00
Niels Andriesse 4fc75e5a78 Implement remaining contextual actions 2021-06-29 10:05:39 +10:00
jubb 6775e0afd7 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
2021-06-29 10:05:34 +10:00
Niels Andriesse 18e345733e Implement a few basic contextual actions 2021-06-28 16:28:00 +10:00
Niels Andriesse c17eb5e404 WIP 2021-06-28 14:51:49 +10:00
Niels Andriesse 8cb4c267c5 Show blocked dialog if needed 2021-06-28 13:36:15 +10:00
Niels Andriesse 12b008c61c Send quotes & link previews 2021-06-28 13:29:17 +10:00
jubb f41ab951e2 refactor: simplify the long message activity 2021-06-28 12:12:34 +10:00
jubb 4498b6e00f Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
2021-06-28 11:39:11 +10:00
Niels Andriesse 489516b03b Hook up all voice message recording controls 2021-06-28 11:26:13 +10:00
Niels Andriesse 0da2487401 Send voice messages 2021-06-28 11:11:29 +10:00
Niels Andriesse 0e23e45e89 Debug 2021-06-28 10:50:35 +10:00
Niels Andriesse ca3034cb05 Re-implement GIF & document sending 2021-06-28 10:44:00 +10:00
Niels Andriesse bf80f5c449 Re-implement attachment sending 2021-06-28 10:00:18 +10:00
jubb f59b3a3b61 refactor: remove unused KThumbnailView functions, extract intent creation to MediaPreviewActivity 2021-06-28 09:59:33 +10:00
jubb 9cccbd7aae refactor: use activity dispatcher 2021-06-25 16:30:23 +10:00
Niels Andriesse 7f2ffcc114 Implement onActivityResult 2021-06-25 16:09:37 +10:00
Niels Andriesse 20f8931338 Set up attachment pickers 2021-06-25 15:53:47 +10:00
Niels Andriesse 20abe8fdb8 Clean 2021-06-25 15:24:34 +10:00
Niels Andriesse 82e4d3125c Basic message sending (incl. mentions) 2021-06-25 15:20:54 +10:00
Niels Andriesse 0ac0cba448 Insert mentions 2021-06-25 15:11:38 +10:00
jubb ce098fe918 fix: change the content click to be hit-rect based to determine child object intersection for views with multiple content objects 2021-06-25 14:43:22 +10:00
Niels Andriesse 6140be6e56 Add back mentions business logic 2021-06-25 14:42:04 +10:00
Niels Andriesse cc98ab5c9f Send typing indicators & fix missing mention handling 2021-06-25 11:11:03 +10:00
Niels Andriesse 40f859c567 Fix scroll to bottom button visibility logic 2021-06-25 10:55:50 +10:00
Niels Andriesse 851f4c5cf7 Send read receipts 2021-06-25 10:18:04 +10:00
Niels Andriesse 7f1af51013 Update unread message count on scroll 2021-06-25 10:02:59 +10:00
jubb 4a8c5f5946 Merge remote-tracking branch 'upstream/ui' into ui 2021-06-25 09:58:07 +10:00
jubb 620d063194 feat: adding text and shade, reverting other components to use old ThumbnailView 2021-06-25 09:57:58 +10:00
Niels Andriesse a7e5ff1ce2 Mark all messages as read upon opening a conversation 2021-06-25 09:44:27 +10:00
Niels Andriesse 2a06904d76 Scroll to first unread message upon opening a conversation 2021-06-25 09:38:26 +10:00
Niels Andriesse ec9df3adb2 Fix crash & add documentation 2021-06-25 09:19:21 +10:00
jubb b5f41b4383 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
2021-06-24 16:26:45 +10:00
Niels Andriesse fe8b0c9798 Create link preview draft view 2021-06-24 16:23:37 +10:00
Niels Andriesse c4bac842dd Observe link preview changes 2021-06-24 15:46:36 +10:00
Niels Andriesse 94e436b922 Fix layout bug 2021-06-24 15:20:33 +10:00
Niels Andriesse 32c2762d06 Make link preview view use thumbnail 2021-06-24 15:03:29 +10:00
Niels Andriesse 2082a58e5a Clean 2021-06-24 14:26:38 +10:00
Niels Andriesse c0429569db Add blocked banner 2021-06-24 14:21:05 +10:00
Niels Andriesse 06b9c30c27 Add trust dialog 2021-06-24 14:05:55 +10:00
Niels Andriesse d763fa00d3 Add link preview dialog 2021-06-24 13:59:53 +10:00
Niels Andriesse 250fb50cc8 Add open URL dialog 2021-06-24 13:54:34 +10:00
Niels Andriesse 058319c9c7 Add join open group dialog 2021-06-24 13:47:24 +10:00
Niels Andriesse 7373918d3d Add blocked dialog 2021-06-24 13:38:59 +10:00
Niels Andriesse ed5641df03 Fetch latest open group member count when opening a conversation 2021-06-24 11:43:51 +10:00
Niels Andriesse e4292a3db5 Add action bar subtitle 2021-06-24 11:38:06 +10:00
Niels Andriesse 62cee715a7 Add documentation 2021-06-24 11:24:25 +10:00
Niels Andriesse 38710814e2 Show typing indicators 2021-06-24 11:22:32 +10:00
Niels Andriesse f66309afd8 Add unread count to conversation view 2021-06-24 10:18:52 +10:00
Niels Andriesse 201b8c8e68 Add unread count to scroll to bottom button 2021-06-24 10:04:43 +10:00
jubb 3c07f8b622 Merge remote-tracking branch 'upstream/ui' into ui 2021-06-23 16:57:04 +10:00
Niels Andriesse 1b6ddc0c0b Hook up scroll button 2021-06-23 16:08:30 +10:00
Niels Andriesse 6533fdb64b Add scroll to bottom button 2021-06-23 15:14:19 +10:00
jubb 313fe2f62c Merge remote-tracking branch 'upstream/ui' into ui 2021-06-23 14:59:46 +10:00
Niels Andriesse 75d58677e4 Add scroll to bottom button plumming 2021-06-23 14:48:29 +10:00
Niels Andriesse c181dfec81 Clean & add documentation 2021-06-23 13:57:13 +10:00
jubb d48f68afc2 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
2021-06-23 13:18:00 +10:00
Niels Andriesse d2d13ec696 Re-add open group guidelines 2021-06-23 13:11:21 +10:00
jubb e62785ecae feat: set visible thread to prevent notifications in ConversationActivityV2.kt 2021-06-23 11:54:17 +10:00
Niels Andriesse e674f70155 Drafts 2021-06-22 16:23:47 +10:00
Niels Andriesse 0eaecf168d Basic link preview view 2021-06-21 15:26:09 +10:00
Niels Andriesse ae078d8ee9 Fix gestures interfering with eachother 2021-06-21 14:48:27 +10:00
Niels Andriesse 517539a837 Fix cell re-use issue 2021-06-21 14:00:48 +10:00
Niels Andriesse 2aaacbd029 Debug 2021-06-18 16:24:56 +10:00
Niels Andriesse 123cd6d486 Handle text only quote drafts 2021-06-18 15:54:24 +10:00
Niels Andriesse 9419bafe93 Add preliminary quote draft view 2021-06-18 15:11:41 +10:00
Niels Andriesse be158eccc1 Animate the mention candidates view 2021-06-18 11:05:14 +10:00
Niels Andriesse efc752e3a1 Add mention candidates view 2021-06-18 11:00:52 +10:00
Niels Andriesse 7c3b1b22d7 Move attachment options as input bar expands 2021-06-18 10:16:15 +10:00
Niels Andriesse a5bf1a3c66 Remaining input bar animation 2021-06-18 09:51:44 +10:00
Niels Andriesse f4621a4fee More animation 2021-06-17 16:29:57 +10:00
Niels Andriesse b5376cd60e Handle voice message recording view hiding 2021-06-17 16:07:11 +10:00
Niels Andriesse b7000aa58b Tweak UI 2021-06-17 15:20:19 +10:00
Niels Andriesse 092dad03b7 Add expanding attachment buttons 2021-06-17 14:34:50 +10:00
Niels Andriesse 4855f694e7 More UI 2021-06-17 14:01:43 +10:00
Niels Andriesse 7b68d63534 Animate voice message lock view 2021-06-17 13:18:09 +10:00
Niels Andriesse 7cacee8499 More animation 2021-06-17 10:53:56 +10:00
Niels Andriesse bdc5a0e5d9 Add animation 2021-06-16 15:49:39 +10:00
Niels Andriesse 5ae201b81b Add basic voice message recording UI 2021-06-16 14:50:41 +10:00
Niels Andriesse 871bafe66d Debug 2021-06-16 09:51:50 +10:00
Niels Andriesse 196fc25902 Make input edit text grow dynamically 2021-06-15 16:14:35 +10:00
Niels Andriesse e06a3271df Add basic input edit text 2021-06-15 14:55:57 +10:00
Niels Andriesse c79b9e3397 Clean 2021-06-10 14:24:18 +10:00
Niels Andriesse e61c3288fa Swipe to reply icon 2021-06-09 15:12:48 +10:00
Niels Andriesse 2988ac8b7a Re-introduce regular press 2021-06-09 11:37:50 +10:00
Niels Andriesse 834ac1106b Implement better swipe to reply gesture 2021-06-09 10:57:40 +10:00