7585 Commits

Author SHA1 Message Date
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
1c14755d9a Update build number 2021-06-30 14:07:03 +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
Ryan Zhao
6e3f6a5f78 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-29 16:12:45 +10:00
Niels Andriesse
bf60989a43 Update build number 2021-06-29 16:09:14 +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
jubb
8b4b264992 fix: 421 errors not being handled properly by sendOnionRequest and prevent retrying with stale swarm data, no longer crash with large NotifyPNServerJob.kt payload in Kryo deserialization 2021-06-29 15:12:33 +10:00
Niels Andriesse
7e114fc2ac Update version number 2021-06-29 14:47:25 +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