|
|
|
|
@ -14,10 +14,9 @@ import android.widget.Toast
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_create_closed_group.emptyStateContainer
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_create_closed_group.mainContentContainer
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_edit_closed_group.*
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameContainer
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameTextView
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_edit_closed_group.ctnGroupNameSection
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_edit_closed_group.txvGroupNameDisplay
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
|
|
|
|
|
import kotlinx.android.synthetic.main.activity_settings.*
|
|
|
|
|
import network.loki.messenger.R
|
|
|
|
|
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
|
|
|
|
|
import org.thoughtcrime.securesms.database.Address
|
|
|
|
|
@ -28,46 +27,71 @@ import org.thoughtcrime.securesms.mms.GlideApp
|
|
|
|
|
import org.thoughtcrime.securesms.recipients.Recipient
|
|
|
|
|
import org.whispersystems.signalservice.api.crypto.ProfileCipher
|
|
|
|
|
|
|
|
|
|
class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
|
|
|
|
|
private var members = listOf<String>()
|
|
|
|
|
set(value) { field = value; editClosedGroupAdapter.members = value }
|
|
|
|
|
const val EXTRA_GROUP_ID = "GROUP_ID"
|
|
|
|
|
const val REQ_CODE_ADD_USERS = 124
|
|
|
|
|
const val LOADER_ID_MEMBERS = 0
|
|
|
|
|
|
|
|
|
|
class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
|
|
|
|
|
|
|
|
|
|
private lateinit var memberListAdapter: EditClosedGroupMembersAdapter
|
|
|
|
|
private val originalMembers = HashSet<String>()
|
|
|
|
|
private val members = HashSet<String>()
|
|
|
|
|
// private var adminMembers = HashSet<String>()
|
|
|
|
|
|
|
|
|
|
private lateinit var groupID: String
|
|
|
|
|
private var membersToRemove = listOf<String>()
|
|
|
|
|
private var membersToAdd = listOf<String>()
|
|
|
|
|
private var admins = listOf<String>()
|
|
|
|
|
private val originalName by lazy { DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title }
|
|
|
|
|
private var nameHasChanged = false
|
|
|
|
|
private lateinit var originalName: String
|
|
|
|
|
private lateinit var newGroupDisplayName: String
|
|
|
|
|
|
|
|
|
|
private var nameHasChanged = false
|
|
|
|
|
|
|
|
|
|
private val editClosedGroupAdapter by lazy {
|
|
|
|
|
val result = EditClosedGroupAdapter(this)
|
|
|
|
|
result.glide = GlideApp.with(this)
|
|
|
|
|
result.memberClickListener = this
|
|
|
|
|
result
|
|
|
|
|
}
|
|
|
|
|
private var isEditingGroupName = false
|
|
|
|
|
set(value) { field = value; handleIsEditingDisplayNameChanged() }
|
|
|
|
|
|
|
|
|
|
companion object {
|
|
|
|
|
@JvmField
|
|
|
|
|
public val GROUP_ID = "GROUP_ID"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// region Lifecycle
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
|
|
|
|
|
super.onCreate(savedInstanceState, isReady)
|
|
|
|
|
groupID = intent.getStringExtra(GROUP_ID)
|
|
|
|
|
setContentView(R.layout.activity_edit_closed_group)
|
|
|
|
|
|
|
|
|
|
this.groupID = intent.getStringExtra(EXTRA_GROUP_ID)
|
|
|
|
|
this.originalName = DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title
|
|
|
|
|
|
|
|
|
|
supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
|
|
|
|
|
displayNameContainer.setOnClickListener { showEditDisplayNameUI() }
|
|
|
|
|
displayNameTextView.text = originalName
|
|
|
|
|
cancelEditButton.setOnClickListener { cancelEditingDisplayName() }
|
|
|
|
|
saveEditButton.setOnClickListener { saveDisplayName() }
|
|
|
|
|
recyclerView.adapter = editClosedGroupAdapter
|
|
|
|
|
|
|
|
|
|
txvGroupNameDisplay.text = originalName
|
|
|
|
|
ctnGroupNameSection.setOnClickListener { showEditDisplayNameUI() }
|
|
|
|
|
btnCancelGroupNameEdit.setOnClickListener { cancelEditingDisplayName() }
|
|
|
|
|
btnSaveGroupName.setOnClickListener { saveDisplayName() }
|
|
|
|
|
|
|
|
|
|
addMembersClosedGroupButton.setOnClickListener { onAddMembersClick() }
|
|
|
|
|
|
|
|
|
|
this.memberListAdapter = EditClosedGroupMembersAdapter(
|
|
|
|
|
this,
|
|
|
|
|
GlideApp.with(this),
|
|
|
|
|
this::onMemberClick
|
|
|
|
|
)
|
|
|
|
|
recyclerView.adapter = this.memberListAdapter
|
|
|
|
|
recyclerView.layoutManager = LinearLayoutManager(this)
|
|
|
|
|
addMembersClosedGroupButton.setOnClickListener { onAddMember() }
|
|
|
|
|
LoaderManager.getInstance(this).initLoader(0, null, this)
|
|
|
|
|
|
|
|
|
|
// Setup member list loader.
|
|
|
|
|
LoaderManager.getInstance(this).initLoader(LOADER_ID_MEMBERS, null, object : LoaderManager.LoaderCallbacks<List<String>> {
|
|
|
|
|
override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
|
|
|
|
|
return EditClosedGroupLoader(groupID, this@EditClosedGroupActivity)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
|
|
|
|
|
// We no longer need any subsequent loading events
|
|
|
|
|
// (they will occur on every activity resume)
|
|
|
|
|
LoaderManager.getInstance(this@EditClosedGroupActivity).destroyLoader(LOADER_ID_MEMBERS)
|
|
|
|
|
|
|
|
|
|
originalMembers.clear()
|
|
|
|
|
originalMembers.addAll(members.toHashSet())
|
|
|
|
|
updateMembers(originalMembers)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override fun onLoaderReset(loader: Loader<List<String>>) {
|
|
|
|
|
updateMembers(setOf())
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
|
|
|
|
@ -77,20 +101,12 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
|
|
|
|
|
// endregion
|
|
|
|
|
|
|
|
|
|
// region Updating
|
|
|
|
|
override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
|
|
|
|
|
return EditClosedGroupLoader(groupID, this)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
|
|
|
|
|
update(members)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override fun onLoaderReset(loader: Loader<List<String>>) {
|
|
|
|
|
update(listOf())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun update(members: List<String>) {
|
|
|
|
|
this.members = members
|
|
|
|
|
private fun updateMembers(members: Set<String>) {
|
|
|
|
|
this.members.clear()
|
|
|
|
|
this.members.addAll(members)
|
|
|
|
|
this.memberListAdapter.setItems(members)
|
|
|
|
|
mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
|
|
|
|
|
emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
|
|
|
|
|
invalidateOptionsMenu()
|
|
|
|
|
@ -99,8 +115,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
|
|
|
|
|
|
|
|
|
|
// region Interaction
|
|
|
|
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
|
|
|
|
val id = item.itemId
|
|
|
|
|
when(id) {
|
|
|
|
|
when(item.itemId) {
|
|
|
|
|
R.id.applyButton -> modifyClosedGroup()
|
|
|
|
|
}
|
|
|
|
|
return super.onOptionsItemSelected(item)
|
|
|
|
|
@ -113,54 +128,54 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
|
|
|
|
|
isEditingGroupName = false
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override fun onMemberClick(member: String) {
|
|
|
|
|
private fun onMemberClick(member: String) {
|
|
|
|
|
val bottomSheet = GroupEditingOptionsBottomSheet()
|
|
|
|
|
bottomSheet.onRemoveTapped = {
|
|
|
|
|
membersToRemove = membersToRemove + member
|
|
|
|
|
members = members - member
|
|
|
|
|
val changedMembers = members - member
|
|
|
|
|
updateMembers(changedMembers)
|
|
|
|
|
bottomSheet.dismiss()
|
|
|
|
|
}
|
|
|
|
|
// bottomSheet.onAdminTapped = {
|
|
|
|
|
// bottomSheet.dismiss()
|
|
|
|
|
// }
|
|
|
|
|
bottomSheet.show(supportFragmentManager, "closeBottomSheet")
|
|
|
|
|
bottomSheet.show(supportFragmentManager, "MEMBER_BOTTOM_SHEET")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun onAddMember() {
|
|
|
|
|
private fun onAddMembersClick() {
|
|
|
|
|
val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
|
|
|
|
|
startActivityForResult(intent, 124)
|
|
|
|
|
startActivityForResult(intent, REQ_CODE_ADD_USERS)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
|
|
|
super.onActivityResult(requestCode, resultCode, data)
|
|
|
|
|
if (resultCode == RESULT_OK) {
|
|
|
|
|
if (data != null && data.hasExtra("Selected Contacts Result")) {
|
|
|
|
|
val returnedContacts = data.extras.getStringArray("Selected Contacts Result")
|
|
|
|
|
val selectedContacts = returnedContacts.toList()
|
|
|
|
|
membersToAdd = selectedContacts + 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?
|
|
|
|
|
when (requestCode) {
|
|
|
|
|
REQ_CODE_ADD_USERS -> {
|
|
|
|
|
if (resultCode != RESULT_OK) return
|
|
|
|
|
if (data == null || data.extras == null || !data.hasExtra(EXTRA_SELECTED_CONTACTS)) return
|
|
|
|
|
|
|
|
|
|
val selectedContacts = data.extras!!.getStringArray(EXTRA_SELECTED_CONTACTS)!!.toSet()
|
|
|
|
|
val changedMembers = members + selectedContacts
|
|
|
|
|
updateMembers(changedMembers)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun handleIsEditingDisplayNameChanged() {
|
|
|
|
|
cancelEditButton.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
|
|
|
|
|
saveEditButton.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
|
|
|
|
|
displayNameTextView.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
|
|
|
|
|
groupNameEditText.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
|
|
|
|
|
btnCancelGroupNameEdit.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
|
|
|
|
|
btnSaveGroupName.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
|
|
|
|
|
txvGroupNameDisplay.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
|
|
|
|
|
edtGroupName.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
|
|
|
|
|
val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
|
|
|
|
|
if (isEditingGroupName) {
|
|
|
|
|
groupNameEditText.requestFocus()
|
|
|
|
|
inputMethodManager.showSoftInput(groupNameEditText, 0)
|
|
|
|
|
edtGroupName.requestFocus()
|
|
|
|
|
inputMethodManager.showSoftInput(edtGroupName, 0)
|
|
|
|
|
} else {
|
|
|
|
|
inputMethodManager.hideSoftInputFromWindow(groupNameEditText.windowToken, 0)
|
|
|
|
|
inputMethodManager.hideSoftInputFromWindow(edtGroupName.windowToken, 0)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun saveDisplayName() {
|
|
|
|
|
var groupDisplayName = groupNameEditText.text.toString().trim()
|
|
|
|
|
val groupDisplayName = edtGroupName.text.toString().trim()
|
|
|
|
|
if (groupDisplayName.isEmpty()) {
|
|
|
|
|
return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show()
|
|
|
|
|
}
|
|
|
|
|
@ -171,26 +186,32 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
|
|
|
|
|
return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
|
|
|
|
|
}
|
|
|
|
|
newGroupDisplayName = groupDisplayName
|
|
|
|
|
displayNameTextView.text = groupDisplayName
|
|
|
|
|
txvGroupNameDisplay.text = groupDisplayName
|
|
|
|
|
nameHasChanged = true
|
|
|
|
|
isEditingGroupName = false
|
|
|
|
|
return Toast.makeText(this, "Name Changed", Toast.LENGTH_SHORT).show()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun modifyClosedGroup() {
|
|
|
|
|
if (!nameHasChanged && membersToRemove.isEmpty() && membersToAdd.isEmpty()) { finish() } else {
|
|
|
|
|
var groupDisplayName = originalName
|
|
|
|
|
if (nameHasChanged) {
|
|
|
|
|
groupDisplayName = newGroupDisplayName
|
|
|
|
|
}
|
|
|
|
|
val finalGroupMembers = members.map {
|
|
|
|
|
Recipient.from(this, Address.fromSerialized(it), false)
|
|
|
|
|
}.toSet()
|
|
|
|
|
val finalGroupAdmins = admins.map {
|
|
|
|
|
Recipient.from(this, Address.fromSerialized(it), false)
|
|
|
|
|
}.toSet()
|
|
|
|
|
GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
|
|
|
|
|
val membersHaveChanged = members.size != originalMembers.size || !members.containsAll(originalMembers)
|
|
|
|
|
|
|
|
|
|
if (!nameHasChanged && !membersHaveChanged) {
|
|
|
|
|
finish()
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var groupDisplayName = originalName
|
|
|
|
|
if (nameHasChanged) {
|
|
|
|
|
groupDisplayName = newGroupDisplayName
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val finalGroupMembers = members.map {
|
|
|
|
|
Recipient.from(this, Address.fromSerialized(it), false)
|
|
|
|
|
}.toSet()
|
|
|
|
|
// val finalGroupAdmins = adminMembers.map {
|
|
|
|
|
// Recipient.from(this, Address.fromSerialized(it), false)
|
|
|
|
|
// }.toSet()
|
|
|
|
|
val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the group's users are admins.
|
|
|
|
|
GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
|
|
|
|
|
finish()
|
|
|
|
|
}
|
|
|
|
|
}
|
Anton Chekulaev
4 years ago