TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-30 10:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

User count validation for edit closed group activity.

Browse Source
This commit is contained in:
Anton Chekulaev 2020-08-14 16:48:56 +10:00
parent 15d463161a
commit d9599b984a
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
View File

@ -116,7 +116,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
// region Interaction // region Interaction
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
when(item.itemId) { when(item.itemId) {
R.id.applyButton -> modifyClosedGroup() R.id.applyButton -> commitClosedGroupChanges()
} }
return super.onOptionsItemSelected(item) return super.onOptionsItemSelected(item)
} }
@ -191,7 +191,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
isEditingGroupName = false isEditingGroupName = false
} }
private fun modifyClosedGroup() { private fun commitClosedGroupChanges() {
val membersHaveChanged = members.size != originalMembers.size || !members.containsAll(originalMembers) val membersHaveChanged = members.size != originalMembers.size || !members.containsAll(originalMembers)
if (!nameHasChanged && !membersHaveChanged) { if (!nameHasChanged && !membersHaveChanged) {
@ -199,18 +199,28 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
return return
} }
var groupDisplayName = originalName val groupDisplayName = if (nameHasChanged) newGroupDisplayName else originalName
if (nameHasChanged) {
groupDisplayName = newGroupDisplayName
}
val finalGroupMembers = members.map { val finalGroupMembers = members.map {
Recipient.from(this, Address.fromSerialized(it), false) Recipient.from(this, Address.fromSerialized(it), false)
}.toSet() }.toSet()
// val finalGroupAdmins = adminMembers.map { // val finalGroupAdmins = adminMembers.map {
// Recipient.from(this, Address.fromSerialized(it), false) // Recipient.from(this, Address.fromSerialized(it), false)
// }.toSet() // }.toSet()
val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the group's users are admins. val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the users are admins.
if (groupDisplayName.length >= 64) {
return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
}
if (finalGroupMembers.size < 2) {
return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
}
if (finalGroupMembers.size > 10) {
return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
}
GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins) GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
finish() finish()
} }