Commit Graph

973 Commits

Author SHA1 Message Date
Niels Andriesse
5168e15640 Merge branch 'dev' into security 2021-07-12 14:27:14 +10:00
jubb
837f133f7c fix: compilation errors 2021-07-12 10:51:01 +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
1d1b675c41 fix: voice view showing loader on isInProgress instead of isPendingDownload 2021-07-09 16:06:35 +10:00
jubb
fa06a57ec3 fix: getting local user's ID if message is outgoing to check against that value in attachment download 2021-07-09 16:04:06 +10:00
Niels Andriesse
3ac19e94fb Clean 2021-07-09 15:45:15 +10:00
jubb
1ee1d1795d fix: only resume AttachmentDownloadJobs and fix boolean logic on returning early in download job 2021-07-09 15:17:07 +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
dc790560fd Clean & debug 2021-07-09 13:56:38 +10:00
Niels Andriesse
9d447608da Re-organize files 2021-07-09 13:25:57 +10:00
Niels Andriesse
c984d90b04 Re-organize files 2021-07-09 13:18:48 +10:00
Niels Andriesse
05cc6ea742 Re-enable copying Session IDs in closed groups & clean 2021-07-09 13:01:16 +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
jubb
bc4f660fb0 fix: downloads now don't automatically queue for untrusted contacts and UI to handle re-downloading failed attachments 2021-07-08 17:14:53 +10:00
Niels Andriesse
666cab9df6 Clean up TextSecurePreferences 2021-07-08 16:31:37 +10:00
Niels Andriesse
5be63cd297 Update build number 2021-07-08 13:38:14 +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
Niels Andriesse
7aefa288d9
Merge pull request #644 from RyanRory/auto-play-voice-message
Auto Play Next Voice Message If Possible
2021-07-08 11:25:57 +10:00
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
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
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
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
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
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
95716cc23a Merge remote-tracking branch 'upstream/dev' into ui
# Conflicts:
#	app/build.gradle
2021-07-05 17:32:29 +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
b329402faf fix: audio waveforms decoded on the attachment download 2021-07-01 17:06:42 +10:00
Niels Andriesse
c11c4ea7ad Fix slight alignment issue 2021-07-01 14:19:12 +10:00
jubb
8701f68292 fix: prevent crash in audio view 2021-07-01 13:43:48 +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
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
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
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
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