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

1337 Commits

Author SHA1 Message Date
ryanzhao
c4a3463416 send unsend request to self only for delete locally 2021-08-17 12:17:40 +10:00
ryanzhao
b9dd229207 add a flag to disable unsend requests 2021-08-16 15:09:12 +10:00
ryanzhao
144992d817 Merge branch 'dev' of https://github.com/oxen-io/session-android into unsend-request 2021-08-16 14:38:39 +10:00
Harris
dbec5ad53c fix: fixing the message dismissal of notifications for threads upon activity resume. using media send activity's camera intent for consistency 2021-08-16 14:05:49 +10:00
ryanzhao
e8551a3545 improve delete option ui 2021-08-16 12:08:35 +10:00
ryanzhao
4ce1bd6875 clean 2021-08-16 11:59:52 +10:00
ryanzhao
ee3e9ae17f delete outgoing message for linked device 2021-08-16 09:58:28 +10:00
ryanzhao
064e509992 fix a minor issue for closed group 2021-08-13 16:33:30 +10:00
ryanzhao
cb59a1af2d minor fix 2021-08-13 15:49:05 +10:00
ryanzhao
aad58043d3 add UI options for delete messages 2021-08-13 15:30:26 +10:00
Harris
266ed2fa78 feat: allow opening conversation thread from UserDetailsBottomSheet.kt 
refactor the copy button logic to occur when long pressing the Session ID text to fix #517
 2021-08-12 17:50:35 +10:00
ryanzhao
4f89c33676 fix a issue that the unread count can be negative 2021-08-12 16:37:53 +10:00
Harris
7e791d63dc fix: other view types have clickable links, clickable links in the long message. Ordering of highlight mentions before getting clickable spans 
fixes #664
 2021-08-12 15:36:08 +10:00
ryanzhao
9dcc5dd848 disable interaction for deleted messages 2021-08-12 15:01:48 +10:00
ryanzhao
9ab285c3be handle home screen update for unsend request 2021-08-12 14:14:37 +10:00
ryanzhao
8b6b02911f handle database for message deleted by unsend request 2021-08-12 11:43:33 +10:00
ryanzhao
23a61299ac bind deleted message view 2021-08-11 16:35:48 +10:00
ryanzhao
77b5b3ab01 deleted message bubble ui 2021-08-11 15:36:13 +10:00
ryanzhao
0000aa0d13 delete locally after successfully delete remotely 2021-08-11 15:24:33 +10:00
ryanzhao
af6c19690b send unsend request & delete remotely 2021-08-11 15:17:53 +10:00
ryanzhao
c3e45a308a store server hash 2021-08-10 16:42:15 +10:00
ryanzhao
bf83f9b391 WIP: message receiver handler for unsend request 2021-08-10 16:00:06 +10:00
Harris
18c177971a bump version number 2021-08-09 11:24:23 +10:00
Harris
bf6c2d29f1 fix: Home activity crash handling from the seed view optimisations. added tests for that plus rendering URL crash 2021-08-09 10:06:58 +10:00
jubb
2d933e4f67 feat: bump build number 2021-08-05 09:42:31 +10:00
jubb
aaa20df5a5 fix: use the HttpUrl parsed URL instead because of IDN's handling of toASCII 2021-08-03 16:43:17 +10:00
Niels Andriesse
2f0c2fed5b Update build number 2021-08-03 15:50:21 +10:00
Niels Andriesse
11928ce072
Merge pull request #690 from hjubb/startup_performance 
Startup Performance Improvements
 2021-08-03 15:48:25 +10:00
jubb
71d186ad59 fix: ASCIIfy the URL open dialog's content. fixes #681 2021-08-03 14:32:34 +10:00
jubb
e064a6d7c3 refactor: move glide assignment into bind 2021-08-03 13:42:15 +10:00
jubb
9b48d5d203 refactor: use simpler way to generate closed group profile pictures, limit the getConversation call in MentionManagerUtilities.kt to 200 to improve link-through performance to v2 conversation activity. fix notify type not being preloaded into settings 2021-08-03 13:36:04 +10:00
jubb
dd01b2968f fix: startup performance fixes 2021-08-02 16:59:55 +10:00
Niels Andriesse
4d5296bb1c Update version number 2021-07-30 13:52:36 +10:00
Niels Andriesse
a5613bf9dc
Merge pull request #683 from hjubb/media_repo_npe 
Fix Gallery Crash
 2021-07-30 13:51:15 +10:00
jubb
072ea41b46 refactor: re-add thread ID for mentions, fix path resolver call 
refactor: re-add thread ID for mentions, fix path resolver call
 2021-07-30 13:46:57 +10:00
jubb
22905787f6 refactor: move when resumed to started 2021-07-30 11:00:53 +10:00
jubb
7890f5bd44 refactor: revert DB change experimentation from latest version 2021-07-30 10:50:58 +10:00
jubb
7bf3b7a033 refactor: quotes also render for mention only notification style, fix mention manager not having public keys for conversations on load 2021-07-30 10:30:04 +10:00
jubb
270af061d6 fix: link preview works properly from new intent or draft 2021-07-30 10:05:07 +10:00
jubb
2a2d97be4c fix: revert simplified sendSingleThreadNotification that wasn't bundling properly, add mentions properly resolving by adding cache call 2021-07-30 09:54:16 +10:00
jubb
0ed7b28b6b refactor: performance experiments 2021-07-29 17:02:58 +10:00
Harris
9d9f543c3b feat: trying upgrade DB for perf and reducing retry interval to congest threads 2021-07-29 08:56:34 +10:00
Harris
18d8261e33 refactor: move resource heavy functions into launch lifecycle scope 2021-07-28 09:33:57 +10:00
Niels Andriesse
0d25ad8561 Update build number 2021-07-27 10:38:12 +10:00
Niels Andriesse
2c1a473af4 Update build number 2021-07-26 15:51:01 +10:00
Niels Andriesse
49d0d13a5a
Merge pull request #677 from hjubb/ux_improvements 
Small UI/UX Improvements
 2021-07-26 15:49:26 +10:00
Harris
69e10caa10 refactor: revert glide cache strategy for separate task 2021-07-26 15:26:55 +10:00
Harris
2d82e48a04 fix: fresh install not updating notification type column in table 2021-07-26 15:07:47 +10:00
Harris
2becf9fabe refactor: only display notification settings when the conversation is unmuted, notify the conversation list listeners when notify settings are updated 2021-07-26 14:50:43 +10:00
Harris
0d0089e3d6 refactor: visible message view and user details bottom sheet updates individual recipient. Remove "none" notifications style 2021-07-26 13:44:04 +10:00
Niels Andriesse
1e54e3ef75 Make copy consistent 2021-07-26 11:35:58 +10:00
Niels Andriesse
c05c6049d7
Merge pull request #675 from hjubb/notification_control 
Fine-Grained Notification controls
 2021-07-26 11:30:19 +10:00
Niels Andriesse
517291c021
Merge pull request #666 from hjubb/lazy_db_instantiation 
Startup Time Improvements Part 1
 2021-07-26 11:26:01 +10:00
Niels Andriesse
ea5a41af52
Merge pull request #676 from oxen-io/authentication 
Implement Authenticated Message Retrieval
 2021-07-26 11:25:12 +10:00
Niels Andriesse
d79d236580 Implement authenticated message retrieval 2021-07-26 11:23:58 +10:00
Harris
285d5a6c22 Merge remote-tracking branch 'upstream/dev' into notification_control 2021-07-26 09:38:11 +10:00
Harris
716dbccb9f feat: add muted forever to ConversationActivityV2.kt 2021-07-26 09:37:39 +10:00
Niels Andriesse
07f43121c3
Merge pull request #672 from hjubb/chat_ux_improvements 
Fixes Open Group Quote Bug
 2021-07-23 16:22:29 +10:00
Harris
3c6b1eff44 fix: open groups update the sent timestamp locally to be the returned group 2021-07-23 16:04:18 +10:00
Niels Andriesse
118447799a Handle incorrect clock setting 2021-07-23 14:09:27 +10:00
Harris
701a40b224 fix: npe on MediaRepository.java in list sorting comparison 2021-07-23 09:46:44 +10:00
Harris
7ef9fb2b28 feat: added notification mentions vector image 2021-07-21 15:25:48 +10:00
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
Harris
7f047f1c2b feat: add mention only icon, trying to figure out non-repeating push notifications 2021-07-20 17:34:07 +10:00
Harris
b95cb2bedb feat: add notification types for all / mentions only or none with UI and push logic 2021-07-20 16:06:59 +10:00
Harris
e557b102e5 refactor: move attachmentsDb into lazy init 2021-07-19 16:33:56 +10:00
Harris
afb186c5f6 refactor: make DBs instantiate lazily 2021-07-19 13:55:11 +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
Harris
18bb446166 Merge remote-tracking branch 'upstream/dev' into remove_persistent_logger 2021-07-19 11:13:07 +10:00
Niels Andriesse
2b97959f45 Update build number 2021-07-19 09:53:53 +10:00
jubb
4b4075bd05 Merge remote-tracking branch 'upstream/dev' into remove_persistent_logger 2021-07-15 16:56:20 +10:00
jubb
a18ab6c079 refactor: remove PersistentLogger.java and fix libsignal build.gradle minSdkVersion 2021-07-15 16:56:13 +10:00
Niels Andriesse
76d87df504 Update build number 2021-07-15 14:35:14 +10:00
jubb
5f7278b9c4 refactor: OpenGroupPollerV2.kt no longer queues jobs and executes synchronously, BackgroundPollWorker.kt no longer replaces periodic tasks but keeps existing ones, removing unused references 2021-07-15 12:00:30 +10:00
Niels Andriesse
3928a799fb Merge branch 'dev' of github.com:oxen-io/session-android into dev 2021-07-15 09:32:31 +10:00
Niels Andriesse
5b612806c5 Include destination info in error messages 2021-07-15 09:32:00 +10:00
Niels Andriesse
15a4200011
Merge pull request #660 from hjubb/update_translations 
Update Translations
 2021-07-15 09:26:14 +10:00
jubb
f9a1ba5cad fix: Spanish (Spain) region translated dropped in favour of language specific 2021-07-15 09:23:41 +10:00
jubb
14278ffc91 feat: add new translation 2021-07-14 17:10:08 +10:00
jubb
065f05bf10 feat: add new translation files from crowdin 2021-07-14 16:09:07 +10:00
Niels Andriesse
e7bf27671d Minor copy fixes 2021-07-14 15:08:59 +10:00
Niels Andriesse
aacd92fb12 Update version number 2021-07-14 14:57:52 +10:00
Niels Andriesse
b141f170bb Clean & fix inconsistent padding 2021-07-14 14:53:45 +10:00
Niels Andriesse
e2b07f1151
Merge pull request #659 from hjubb/fix_audio_player_icon 
Fix Voice Message Icon Bug
 2021-07-14 14:43:41 +10:00
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
jubb
eedeeb61a7 fix: set isPlaying onPlayerStart 2021-07-14 14:02:21 +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
be6a36cc57 Update build number 2021-07-14 09:40:54 +10:00
Niels Andriesse
a554aa574e Fix adapter position vs layout position usage 2021-07-14 09:37:18 +10:00
Niels Andriesse
b6134b42c4 Update build number 2021-07-13 16:42:34 +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
4e883b23e6 Give all media view headers a background color 2021-07-13 13:46:13 +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
5b4061b2d7 Minor UI polish 2021-07-13 13:23:53 +10:00
Niels Andriesse
04b012ea2c Update build number 2021-07-13 10:15:42 +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
1747e4a8ee Don't use testnet 2021-07-12 14:35:22 +10:00
Niels Andriesse
5168e15640 Merge branch 'dev' into security 2021-07-12 14:27:14 +10:00
Niels Andriesse
462a7ed977
Merge pull request #647 from hjubb/trusted_attachment_download 
Only Download Attachments from Trusted Contacts
 2021-07-12 10:57:30 +10:00
jubb
837f133f7c fix: compilation errors 2021-07-12 10:51:01 +10:00
Niels Andriesse
fda28fc6ba Update version number 2021-07-12 10:02:22 +10:00
Niels Andriesse
1932fdd7cc Update build number 2021-07-12 09:31:50 +10:00
Niels Andriesse
6a57ad73f8 Fix Italian translation app name 2021-07-12 09:31:31 +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
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