mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-27 12:05:22 +00:00
Merge remote-tracking branch 'upstream/dev' into identity_key_encryption
This commit is contained in:
commit
51061cac0e
@ -143,7 +143,7 @@ dependencies {
|
|||||||
testImplementation 'org.robolectric:shadows-multidex:4.2'
|
testImplementation 'org.robolectric:shadows-multidex:4.2'
|
||||||
}
|
}
|
||||||
|
|
||||||
def canonicalVersionCode = 181
|
def canonicalVersionCode = 182
|
||||||
def canonicalVersionName = "1.10.13"
|
def canonicalVersionName = "1.10.13"
|
||||||
|
|
||||||
def postFixSize = 10
|
def postFixSize = 10
|
||||||
|
@ -267,7 +267,7 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli
|
|||||||
if (storage.getGroup(groupID) != null) {
|
if (storage.getGroup(groupID) != null) {
|
||||||
// Update the group
|
// Update the group
|
||||||
// Clear zombie list if the group wasn't active
|
// Clear zombie list if the group wasn't active
|
||||||
if (!storage.isGroupActive(groupID)) {
|
if (!storage.isGroupActive(groupPublicKey)) {
|
||||||
storage.setZombieMembers(groupID, listOf())
|
storage.setZombieMembers(groupID, listOf())
|
||||||
}
|
}
|
||||||
storage.updateTitle(groupID, name)
|
storage.updateTitle(groupID, name)
|
||||||
|
Loading…
Reference in New Issue
Block a user