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

fix name editing

Browse Source
This commit is contained in:
Haafingar 2020-06-22 13:51:47 +10:00
parent 91af472d3b
commit 6d615fbb9d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,9 +32,9 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
private var members = listOf<String>() private var members = listOf<String>()
set(value) { field = value; editClosedGroupAdapter.members = value } set(value) { field = value; editClosedGroupAdapter.members = value }
private lateinit var groupID: String private lateinit var groupID: String
private var membersToRemove = setOf<String>() private var membersToRemove = listOf<String>()
private var membersToAdd = setOf<String>() private var membersToAdd = listOf<String>()
private var admins = setOf<String>() private var admins = listOf<String>()
private val originalName by lazy { DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title } private val originalName by lazy { DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title }
private var nameHasChanged = false private var nameHasChanged = false
private lateinit var newGroupDisplayName: String private lateinit var newGroupDisplayName: String
@ -136,9 +136,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
if (data != null && data.hasExtra("Selected Contacts Result")) { if (data != null && data.hasExtra("Selected Contacts Result")) {
val returnedContacts = data.extras.getStringArray("Selected Contacts Result") val returnedContacts = data.extras.getStringArray("Selected Contacts Result")
var selectedContacts = returnedContacts.toSet() val selectedContacts = returnedContacts.toList()
membersToAdd = selectedContacts + membersToAdd membersToAdd = selectedContacts + membersToAdd
members = members + membersToAdd members = members + membersToAdd
Toast.makeText(this.applicationContext, membersToAdd.toString(), Toast.LENGTH_LONG).show()
//TODO:this works for users that were already in the group but were removed in the same edit activity, but not users that were never in the chat. WHy?
} }
} }
} }
@ -158,8 +160,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
} }
private fun saveDisplayName() { private fun saveDisplayName() {
var groupDisplayName = displayNameEditText.text.toString().trim() var groupDisplayName = groupNameEditText.text.toString().trim()
// something about the implementation of displayNameEdit text makes it null insead of whatever the user inputs, causes a crash
if (groupDisplayName.isEmpty()) { if (groupDisplayName.isEmpty()) {
return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show() return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show()
} }
@ -169,10 +170,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
if (groupDisplayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) { if (groupDisplayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show() return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
} }
isEditingGroupName = false
nameHasChanged = true
newGroupDisplayName = groupDisplayName newGroupDisplayName = groupDisplayName
displayNameTextView.text = groupDisplayName
nameHasChanged = true
isEditingGroupName = false
return Toast.makeText(this, "Name Changed", Toast.LENGTH_SHORT).show()
} }
private fun modifyClosedGroup() { private fun modifyClosedGroup() {

4
src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
View File

@ -8,10 +8,10 @@ import org.thoughtcrime.securesms.util.AsyncLoader
class EditClosedGroupLoader(val groupID: String, context: Context) : AsyncLoader<List<String>>(context) { class EditClosedGroupLoader(val groupID: String, context: Context) : AsyncLoader<List<String>>(context) {
override fun loadInBackground(): List<String> { override fun loadInBackground(): List<String> {
val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, false) val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, true)
return members.map { return members.map {
it.address.toPhoneString() it.address.toPhoneString()
} }
/* To do: Load admins in the process here */ /* TODO:Load admins in the process here */
} }
} }