oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity
7,379 Commits 3 Branches 878 Tags 476 MiB
Commit Graph

138 Commits

Author SHA1 Message Date
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 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
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 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 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 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
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 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 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 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 8f2f1a47fd
Merge branch 'ui' into ui 2021-06-29 13:37:11 +10:00
Ryan Zhao 61ff68b532 add search bottom bar ui 2021-06-29 11:49:10 +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
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 c17eb5e404 WIP 2021-06-28 14:51:49 +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 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
Niels Andriesse ca3034cb05 Re-implement GIF & document sending 2021-06-28 10:44:00 +10:00