Commit graph

945 commits

Author SHA1 Message Date
Niels Andriesse
a3ed2c1e26 Merge branch 'master' of github.com:oxen-io/session-android into dev 2021-07-14 14:42:47 +10:00
Niels Andriesse
6028fff59c Make profile pictures tappable 2021-07-14 14:39:20 +10:00
Niels Andriesse
073c9a9efa Fix message clustering bug 2021-07-14 14:27:21 +10:00
Niels Andriesse
b25feb221a Add FAQ button to settings 2021-07-14 14:17:40 +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
f06f4a1a8f Lower swipe to reply threshold by 20% 2021-07-14 11:07:46 +10:00
ryanzhao
ff49363d53 add error code for 429: rate limit 2021-07-14 10:59:14 +10:00
Niels Andriesse
a554aa574e Fix adapter position vs layout position usage 2021-07-14 09:37:18 +10:00
Niels Andriesse
9c60c2133c
Merge pull request #657 from hjubb/prevent_notifications_on_home
Don't Show Notifications Banners on Home Screen
2021-07-13 16:41:30 +10:00
jubb
6a2a04e256 feat: don't show notifications on HomeActivity.kt 2021-07-13 16:31:16 +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
Niels Andriesse
15d74137d0
Merge pull request #653 from hjubb/conversation_handling_intents
Properly Handle External Keyboard Content & Handle Text Content Shared via Intent
2021-07-13 13:29:47 +10:00
Niels Andriesse
da7d8a2f09 Make error more descriptive 2021-07-13 09:58:22 +10:00
jubb
11961cb01b fix: share activity now includes type as text/plain 2021-07-12 15:52:46 +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
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