TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,616 Commits 46 Branches 892 Tags 481 MiB
021d81ab98
Commit Graph

1195 Commits

Author SHA1 Message Date
Ryan Zhao
b559f19ce5 Merge branch 'dev' of https://github.com/oxen-io/session-android into auto-play-voice-message 2021-07-08 11:03:53 +10:00
Niels Andriesse
a716b3dd40 Update version number 2021-07-08 10:55:08 +10:00
Niels Andriesse
0524d42f1a Merge branch 'dev' into security 2021-07-08 10:50:25 +10:00
Niels Andriesse
8ef2a930e3 Add oxen logo 2021-07-08 10:42:42 +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
176456c253 Update build number 2021-07-08 09:23:35 +10:00
Niels Andriesse
ca85044a7b Fix crash 2021-07-08 09:21:18 +10:00
Niels Andriesse
8a7e6d6893
Merge pull request #638 from hjubb/share_invite_chooser 
Replace Share & Invite Intents in Settings Activity with Chooser Dialog
 2021-07-07 16:06:23 +10:00
Harris
7d29bb5f3a refactor: replace the share title chooser for the invite to be the invite button title 2021-07-07 15:51:20 +10:00
Niels Andriesse
a49d7bb5d0 Update build number 2021-07-07 15:41:05 +10:00
Harris
ce490f5f90 fix: avoid crash in voice message view for pending downloads, display the icon on player stop when player starting from another view. Use thread id in setAttachmentAudioExtras 2021-07-07 15:18:12 +10:00
Harris
683b5243bd fix: notify update for attachment's thread ID on setting audio extras 2021-07-07 14:56:53 +10:00
Harris
abed19dd9c feat: move the share intents in settings to a chooser 2021-07-07 14:22:04 +10:00
Niels Andriesse
0b51b8f0b3 Update version number 2021-07-07 14:19:21 +10:00
Niels Andriesse
f4f6675b8c Update translations 2021-07-07 14:12:58 +10:00
Niels Andriesse
09502ee9ab Remove unused resources 2021-07-07 14:00:18 +10:00
Niels Andriesse
6ce37a6231 Remove unused code 2021-07-07 13:03:48 +10:00
Niels Andriesse
9cd99c6c84 Fix quote view size calculation 2021-07-07 10:55:07 +10:00
Niels Andriesse
b854a5d936 Update build number 2021-07-07 09:41:56 +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
56a1c61f6b fix: increase above dev build number 2021-07-05 17:33:03 +10:00
jubb
95716cc23a Merge remote-tracking branch 'upstream/dev' into ui 
# Conflicts:
#	app/build.gradle
 2021-07-05 17:32:29 +10:00
jubb
a593ad6a54 feat: increase build number 2021-07-05 17:18:48 +10:00
jubb
21c0537432 fix: pass original missing to the quote view to prevent image with no content rendering 2021-07-05 16:52:56 +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
f4e5e5e36a fix: duplicate message send bug on attachments 2021-07-05 15:00:32 +10:00
jubb
d57903aa44 fix: open group poller queues trim thread job only if received messages 
deleting quotes should now propagate to set quote missing flag in MMS and update the UI accordingly
 2021-07-05 09:59:54 +10:00
jubb
340d11377d fix: conversations opened from push now go back to home activity 2021-07-02 10:15:56 +10:00
jubb
b329402faf fix: audio waveforms decoded on the attachment download 2021-07-01 17:06:42 +10:00
Niels Andriesse
0a0f7e44f6 Update build number 2021-07-01 14:19:31 +10:00
Niels Andriesse
c11c4ea7ad Fix slight alignment issue 2021-07-01 14:19:12 +10:00
Niels Andriesse
2e1c97f1b1
Merge pull request #625 from hjubb/ui 
Fix Audio Player Crash
 2021-07-01 14:07:46 +10:00
jubb
8701f68292 fix: prevent crash in audio view 2021-07-01 13:43:48 +10:00
Niels Andriesse
98e3754778 Update build number 2021-07-01 13:27:12 +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
f6fdfd26e1 Improve RTL language handling 2021-07-01 11:35:33 +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
Niels Andriesse
fa0b6703e1 Add message expiration timer icon 2021-06-30 15:40:15 +10:00
Niels Andriesse
9b513fa2ba
Merge pull request #622 from RyanRory/ui 
Conversation Screen 2.0 - Search
 2021-06-30 15:08:46 +10:00
Niels Andriesse
7352dac638
Merge pull request #623 from hjubb/ui 
Make Input Bar Edit Text Capitalize Sentences
 2021-06-30 15:07:03 +10:00
ryanzhao
b438c1e16e Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-30 14:58:44 +10:00
jubb
8eb4da34d4 fix: capitalize sentences 2021-06-30 14:58:27 +10:00
Niels Andriesse
764a885280 Hook up new conversation screen everywhere 2021-06-30 14:57:53 +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
dea1aeec57 Fix merge 2021-06-30 14:51:24 +10:00
Niels Andriesse
24b5fca7f8 Move ExpirationTimerView 2021-06-30 14:47:35 +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
1c14755d9a Update build number 2021-06-30 14:07:03 +10:00
Niels Andriesse
91570dc0b2 Remove resolved TODO 2021-06-30 14:05:53 +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
907e0e4974 Remove problematic movement method 2021-06-30 13:25:58 +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
ryanzhao
c5b117406e fix spinner shows incorrectly the second time open search screen 2021-06-30 10:59:35 +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
2159d6836b fix spinning forever 2021-06-29 16:20:55 +10:00
Ryan Zhao
aac58ac5cf Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-29 16:17:19 +10:00
Niels Andriesse
7ce124118f Make static method call explicit 2021-06-29 16:15:47 +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
6e3f6a5f78 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-29 16:12:45 +10:00
Niels Andriesse
bf60989a43 Update build number 2021-06-29 16:09:14 +10:00
jubb
29447d6b59 fix: movement method for all body text moved into the helper function, removed caption from legacy ThumbnailView 2021-06-29 16:09:01 +10:00
jubb
2a32d21933 refactor: remove captionIcon 2021-06-29 16:06:22 +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
7e114fc2ac Update version number 2021-06-29 14:47:25 +10:00
Niels Andriesse
1d83920684 Fix spacing issue 2021-06-29 14:41:13 +10:00
Ryan Zhao
1e787660a8 clean 2021-06-29 14:38:51 +10:00
Niels Andriesse
6393ed03bd Tie up some loose ends 2021-06-29 14:23:36 +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
Ryan Zhao
c294262ff3 fix spinner 2021-06-29 14:00:30 +10:00
Niels Andriesse
1133cf45c3 Fix crash 2021-06-29 13:48:46 +10:00
Niels Andriesse
8f2f1a47fd
Merge branch 'ui' into ui 2021-06-29 13:37:11 +10:00
jubb
60f9f0edfb fix: remove transfer controls from KThumbnailView.kt to prevent view stub being inflated 2021-06-29 13:35:46 +10:00
jubb
c68781fffb fix: long message handles mentions properly and doesn't do linkified text 2021-06-29 13:32:30 +10:00
Niels Andriesse
9f4571b0c1 Implement remaining menu actions 2021-06-29 13:26:33 +10:00
jubb
476c0ea4cd fix: alignment issues fixed 2021-06-29 12:03:04 +10:00
Ryan Zhao
6b4acd0232 clean 2021-06-29 11:51:04 +10:00
Ryan Zhao
f4d3a7359e highlight the search result 2021-06-29 11:49:45 +10:00
Ryan Zhao
61ff68b532 add search bottom bar ui 2021-06-29 11:49:10 +10:00
jubb
09f4cfb1ad feat: add back overflow text, increase AttachmentDownloadJob.kt max failure count, resize overflow text size, remove unused animator update listener implementation in ThumbnailProgressBar.kt 2021-06-29 11:22:59 +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
jubb
3611f4655c fix: merge changes and fix conflicts 2021-06-29 10:06:57 +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
fcdd3d9149 Fix quote clearing bug 2021-06-28 16:03:41 +10:00
jubb
a91cd45b89 feat: new ThumbnailProgressBar.kt for animating the loading progress 2021-06-28 15:55:34 +10:00
Niels Andriesse
fa71c81ea9 Speed up audio on double tap 2021-06-28 15:49:29 +10:00
Niels Andriesse
f44e655361 Fix reply icon offset bug 2021-06-28 15:44:11 +10:00
Niels Andriesse
6d452e19ef Detect double taps 2021-06-28 15:41:23 +10:00
Niels Andriesse
a53ce18404 Fix duration text view 2021-06-28 15:06:51 +10:00
Niels Andriesse
c17eb5e404 WIP 2021-06-28 14:51:49 +10:00
jubb
2e48e5f93e refactor: re-add link movement to text body, remove conversation footer from longmessage_activity.xml 2021-06-28 13:39:06 +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
ab92f3684d
Merge pull request #618 from RyanRory/ui 
Fix Theme Issues
 2021-06-28 11:30:32 +10:00
jubb
d8a2e3450c feat: progress bar is linear similar to iOS 2021-06-28 11:29:27 +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
jubb
ddc75859aa fix: re-add radius to ThumbnailView 2021-06-28 10:47:21 +10:00
Niels Andriesse
ca3034cb05 Re-implement GIF & document sending 2021-06-28 10:44:00 +10:00
jubb
2c8141c8bb fix: don't let the attachment open to preview if in progress or pending download 2021-06-28 10:42:34 +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
Ryan ZHAO
2b26876c4c fix text color for system default dark mode 2021-06-28 09:56:49 +10:00
Ryan ZHAO
3c293f9d2b Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-28 09:17:36 +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
Ryan ZHAO
e459ea0288 fix overflow menu background color 2021-06-25 15:57:43 +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
bb00754237 refactor: change line to have small spacing margin 2021-06-25 14:47:02 +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
40317d9834 Fix corner rounding issue 2021-06-25 14:06:53 +10:00
jubb
c40ad7f86c fix: don't dismiss on clear local when delete in progress 2021-06-25 13:53:07 +10:00
jubb
21835800ff feat: wiring up click listeners in AlbumThumbnailView.kt 2021-06-25 12:18:52 +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
Niels Andriesse
2132e53fb0 Hook up cancel link preview draft button 2021-06-24 16:30:16 +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
jubb
110391c2cd refactor: move new thumbnailview to utilities package 2021-06-24 16:25:43 +10:00
Niels Andriesse
fe8b0c9798 Create link preview draft view 2021-06-24 16:23:37 +10:00
jubb
277c741851 feat: AlbumThumbnailView.kt view visible and binding to thumbnail slides 2021-06-24 16:15:13 +10:00
Niels Andriesse
c4bac842dd Observe link preview changes 2021-06-24 15:46:36 +10:00
Niels Andriesse
11c2983f66 Fix typing indicator color 2021-06-24 15:27:00 +10:00
Niels Andriesse
94e436b922 Fix layout bug 2021-06-24 15:20:33 +10:00
Niels Andriesse
dabe26a1c9 Highlight mentions 2021-06-24 15:17:12 +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
ec8d4c9f5d Large emojis 2021-06-24 14:13:36 +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
1dc7f7e9c0 Make dialogs look better 2021-06-24 13:14:18 +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
19f2546d81 Merge remote-tracking branch 'upstream/ui' into ui 2021-06-24 09:43:28 +10:00
Niels Andriesse
311a298c0c Debug 2021-06-24 09:34:16 +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
74697b0be7 Linkify URLs 2021-06-23 14:08:17 +10:00
Niels Andriesse
c181dfec81 Clean & add documentation 2021-06-23 13:57:13 +10:00
Niels Andriesse
ca98a24839 Debug 2021-06-23 13:39:24 +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
0291171fb8 Fix quote view sizing 2021-06-23 11:32:05 +10:00
jubb
1ba12c40cc feat: also adjust clear all button to be delete / clear network depending on step 2021-06-23 10:29:17 +10:00
Niels Andriesse
da0ed31f9b Merge branch 'dev' of github.com:oxen-io/session-android into ui 2021-06-23 09:25:56 +10:00
jubb
1df6fa46a4 feat: clear all data dialog with local and network only options 2021-06-22 17:01:27 +10:00
Niels Andriesse
edb0763060 Fix group message layout & handle profile pictures 2021-06-22 16:42:53 +10:00