1063 Commits

Author SHA1 Message Date
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
Niels Andriesse
c4a5fa4594 Update build number 2021-07-09 15:23:17 +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
ffc51f400f Update build number 2021-07-09 10:12:47 +10:00
Niels Andriesse
b2bdbeb31d Fix camera intent issue 2021-07-09 10:12:30 +10:00
Niels Andriesse
2f7002ac7a Update build number 2021-07-09 09:39:09 +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
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