mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-23 18:15:22 +00:00
Fixes #1476 - Canononical version number needs to be bumped to provide new Google Play Store release
Co-authored-by: alansley <aclansley@gmail.com>
This commit is contained in:
parent
629f98dfb4
commit
d8daf6175e
@ -31,7 +31,7 @@ configurations.all {
|
||||
exclude module: "commons-logging"
|
||||
}
|
||||
|
||||
def canonicalVersionCode = 370
|
||||
def canonicalVersionCode = 371
|
||||
def canonicalVersionName = "1.18.2"
|
||||
|
||||
def postFixSize = 10
|
||||
|
@ -252,7 +252,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
|
||||
viewModelFactory.create(threadId, MessagingModuleConfiguration.shared.getUserED25519KeyPair())
|
||||
}
|
||||
private var actionMode: ActionMode? = null
|
||||
private var unreadCount = 0
|
||||
private var unreadCount = Int.MAX_VALUE
|
||||
// Attachments
|
||||
private val audioRecorder = AudioRecorder(this)
|
||||
private val stopAudioHandler = Handler(Looper.getMainLooper())
|
||||
@ -572,10 +572,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
|
||||
binding!!.conversationRecyclerView.layoutManager = layoutManager
|
||||
// Workaround for the fact that CursorRecyclerViewAdapter doesn't auto-update automatically (even though it says it will)
|
||||
LoaderManager.getInstance(this).restartLoader(0, null, this)
|
||||
binding!!.conversationRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||
binding!!.conversationRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||
|
||||
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
|
||||
if (recyclerScrollState == RecyclerView.SCROLL_STATE_IDLE) {
|
||||
// The unreadCount check is to prevent us scrolling to the bottom when we first enter a conversation
|
||||
if (recyclerScrollState == RecyclerView.SCROLL_STATE_IDLE && unreadCount != Int.MAX_VALUE) {
|
||||
scrollToMostRecentMessageIfWeShould()
|
||||
}
|
||||
handleRecyclerViewScrolled()
|
||||
|
Loading…
Reference in New Issue
Block a user