Niels Andriesse
5 years ago
committed by
GitHub
commit
e84a49bd38
@ -0,0 +1,5 @@
|
|||||||
|
<vector android:height="24dp" android:tint="#FFFFFF"
|
||||||
|
android:viewportHeight="24" android:viewportWidth="24"
|
||||||
|
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="@android:color/white" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
|
||||||
|
</vector>
|
||||||
@ -0,0 +1,149 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<RelativeLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:background="@drawable/default_session_background"
|
||||||
|
tools:context="org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/mainContentContainer"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/ctnGroupNameSection"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="@dimen/large_spacing"
|
||||||
|
android:gravity="center">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/cntGroupNameEdit"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:visibility="invisible"
|
||||||
|
tools:visibility="visible">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/btnCancelGroupNameEdit"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:src="@drawable/ic_close_white_24dp"/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
style="@style/SessionEditText"
|
||||||
|
android:id="@+id/edtGroupName"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_marginStart="@dimen/small_spacing"
|
||||||
|
android:layout_marginEnd="@dimen/small_spacing"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:paddingTop="12dp"
|
||||||
|
android:paddingBottom="12dp"
|
||||||
|
android:inputType="text"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:imeOptions="actionDone"
|
||||||
|
android:hint="@string/activity_edit_closed_group_edit_text_hint" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/btnSaveGroupNameEdit"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:src="@drawable/ic_check_white_24dp"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/cntGroupNameDisplay"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:visibility="visible"
|
||||||
|
tools:visibility="invisible">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/lblGroupNameDisplay"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:textSize="@dimen/very_large_font_size"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:paddingStart="24dp"
|
||||||
|
android:paddingEnd="0dp"
|
||||||
|
android:drawableEnd="@drawable/ic_edit_white_24dp"
|
||||||
|
android:drawablePadding="@dimen/small_spacing"
|
||||||
|
tools:text="SomeGroupName"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1px"
|
||||||
|
android:background="@color/separator" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/medium_spacing"
|
||||||
|
android:layout_marginTop="@dimen/small_spacing"
|
||||||
|
android:layout_marginEnd="@dimen/small_spacing"
|
||||||
|
android:layout_marginBottom="@dimen/small_spacing"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="@string/activity_edit_closed_group_edit_members"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:textSize="@dimen/medium_font_size" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/addMembersClosedGroupButton"
|
||||||
|
style="@style/MediumProminentOutlineButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="@dimen/small_button_height"
|
||||||
|
android:layout_marginTop="@dimen/small_spacing"
|
||||||
|
android:layout_marginEnd="@dimen/medium_spacing"
|
||||||
|
android:layout_marginStart="@dimen/small_spacing"
|
||||||
|
android:layout_marginBottom="@dimen/small_spacing"
|
||||||
|
android:paddingStart="@dimen/medium_spacing"
|
||||||
|
android:paddingEnd="@dimen/medium_spacing"
|
||||||
|
android:text="@string/activity_edit_closed_group_add_members" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1px"
|
||||||
|
android:background="@color/separator" />
|
||||||
|
|
||||||
|
<android.support.v7.widget.RecyclerView
|
||||||
|
android:id="@+id/recyclerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/emptyStateContainer"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_centerInParent="true">
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<RelativeLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@drawable/default_session_background" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/mainContentContainer"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<android.support.v7.widget.RecyclerView
|
||||||
|
android:id="@+id/recyclerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/emptyStateContainer"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_centerInParent="true">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="@dimen/medium_font_size"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:text="@string/activity_create_closed_group_empty_state_message" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:behavior_hideable="true"
|
||||||
|
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
|
||||||
|
android:background="@color/dialog_background">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/removeFromGroup"
|
||||||
|
style="@style/ActionItem"
|
||||||
|
android:drawableStart="@drawable/ic_phonelink_erase_white_24dp"
|
||||||
|
android:textSize="@dimen/medium_font_size"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:text="@string/fragment_edit_group_bottom_sheet_remove"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
|
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
||||||
|
|
||||||
<item android:title="@string/GroupCreateActivity_menu_apply_button"
|
|
||||||
android:id="@+id/menu_create_group"
|
|
||||||
android:icon="?menu_accept_icon"
|
|
||||||
app:showAsAction="always|withText"/>
|
|
||||||
|
|
||||||
</menu>
|
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:title="@string/menu_apply_button"
|
||||||
|
android:id="@+id/applyButton"
|
||||||
|
android:icon="?menu_accept_icon"
|
||||||
|
app:showAsAction="always" />
|
||||||
|
|
||||||
|
</menu>
|
||||||
@ -0,0 +1,243 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.activities
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.v4.app.LoaderManager
|
||||||
|
import android.support.v4.content.Loader
|
||||||
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
|
import android.view.Menu
|
||||||
|
import android.view.MenuItem
|
||||||
|
import android.view.View
|
||||||
|
import android.view.inputmethod.EditorInfo
|
||||||
|
import android.view.inputmethod.InputMethodManager
|
||||||
|
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_linked_devices.recyclerView
|
||||||
|
import network.loki.messenger.R
|
||||||
|
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
|
||||||
|
import org.thoughtcrime.securesms.database.Address
|
||||||
|
import org.thoughtcrime.securesms.database.DatabaseFactory
|
||||||
|
import org.thoughtcrime.securesms.groups.GroupManager
|
||||||
|
import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSheet
|
||||||
|
import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
|
||||||
|
import org.thoughtcrime.securesms.mms.GlideApp
|
||||||
|
import org.thoughtcrime.securesms.recipients.Recipient
|
||||||
|
import org.thoughtcrime.securesms.util.GroupUtil
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences
|
||||||
|
import org.whispersystems.signalservice.loki.utilities.toHexString
|
||||||
|
import java.io.IOException
|
||||||
|
|
||||||
|
class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
|
||||||
|
private val originalMembers = HashSet<String>()
|
||||||
|
private val members = HashSet<String>()
|
||||||
|
private var hasNameChanged = false
|
||||||
|
|
||||||
|
private lateinit var groupID: String
|
||||||
|
private lateinit var originalName: String
|
||||||
|
private lateinit var name: String
|
||||||
|
|
||||||
|
private var isEditingName = false
|
||||||
|
set(value) {
|
||||||
|
if (field == value) return
|
||||||
|
field = value
|
||||||
|
handleIsEditingNameChanged()
|
||||||
|
}
|
||||||
|
|
||||||
|
private val memberListAdapter by lazy {
|
||||||
|
EditClosedGroupMembersAdapter(this, GlideApp.with(this), this::onMemberClick)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
@JvmStatic val groupIDKey = "groupIDKey"
|
||||||
|
private val loaderID = 0
|
||||||
|
val addUsersRequestCode = 124
|
||||||
|
val legacyGroupSizeLimit = 10
|
||||||
|
}
|
||||||
|
|
||||||
|
// region Lifecycle
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
|
||||||
|
super.onCreate(savedInstanceState, isReady)
|
||||||
|
|
||||||
|
setContentView(R.layout.activity_edit_closed_group)
|
||||||
|
supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
|
||||||
|
|
||||||
|
groupID = intent.getStringExtra(Companion.groupIDKey)
|
||||||
|
originalName = DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title
|
||||||
|
name = originalName
|
||||||
|
|
||||||
|
addMembersClosedGroupButton.setOnClickListener { onAddMembersClick() }
|
||||||
|
|
||||||
|
recyclerView.adapter = memberListAdapter
|
||||||
|
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||||
|
|
||||||
|
lblGroupNameDisplay.text = originalName
|
||||||
|
cntGroupNameDisplay.setOnClickListener { isEditingName = true }
|
||||||
|
btnCancelGroupNameEdit.setOnClickListener { isEditingName = false }
|
||||||
|
btnSaveGroupNameEdit.setOnClickListener { saveName() }
|
||||||
|
edtGroupName.setImeActionLabel(getString(R.string.save), EditorInfo.IME_ACTION_DONE)
|
||||||
|
edtGroupName.setOnEditorActionListener { _, actionId, _ ->
|
||||||
|
when (actionId) {
|
||||||
|
EditorInfo.IME_ACTION_DONE -> {
|
||||||
|
saveName()
|
||||||
|
return@setOnEditorActionListener true
|
||||||
|
}
|
||||||
|
else -> return@setOnEditorActionListener false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LoaderManager.getInstance(this).initLoader(Companion.loaderID, null, object : LoaderManager.LoaderCallbacks<List<String>> {
|
||||||
|
|
||||||
|
override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
|
||||||
|
return EditClosedGroupLoader(this@EditClosedGroupActivity, groupID)
|
||||||
|
}
|
||||||
|
|
||||||
|
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(Companion.loaderID)
|
||||||
|
|
||||||
|
originalMembers.clear()
|
||||||
|
originalMembers.addAll(members.toHashSet())
|
||||||
|
updateMembers(originalMembers)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onLoaderReset(loader: Loader<List<String>>) {
|
||||||
|
updateMembers(setOf())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||||
|
menuInflater.inflate(R.menu.menu_apply, menu)
|
||||||
|
return members.isNotEmpty()
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Updating
|
||||||
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
||||||
|
super.onActivityResult(requestCode, resultCode, data)
|
||||||
|
when (requestCode) {
|
||||||
|
Companion.addUsersRequestCode -> {
|
||||||
|
if (resultCode != RESULT_OK) return
|
||||||
|
if (data == null || data.extras == null || !data.hasExtra(SelectContactsActivity.selectedContactsKey)) return
|
||||||
|
|
||||||
|
val selectedContacts = data.extras!!.getStringArray(SelectContactsActivity.selectedContactsKey)!!.toSet()
|
||||||
|
val changedMembers = members + selectedContacts
|
||||||
|
updateMembers(changedMembers)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleIsEditingNameChanged() {
|
||||||
|
cntGroupNameEdit.visibility = if (isEditingName) View.VISIBLE else View.INVISIBLE
|
||||||
|
cntGroupNameDisplay.visibility = if (isEditingName) View.INVISIBLE else View.VISIBLE
|
||||||
|
val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
|
||||||
|
if (isEditingName) {
|
||||||
|
edtGroupName.setText(name)
|
||||||
|
edtGroupName.selectAll()
|
||||||
|
edtGroupName.requestFocus()
|
||||||
|
inputMethodManager.showSoftInput(edtGroupName, 0)
|
||||||
|
} else {
|
||||||
|
inputMethodManager.hideSoftInputFromWindow(edtGroupName.windowToken, 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateMembers(members: Set<String>) {
|
||||||
|
this.members.clear()
|
||||||
|
this.members.addAll(members)
|
||||||
|
memberListAdapter.setMembers(members)
|
||||||
|
|
||||||
|
val userPublicKey = TextSecurePreferences.getLocalNumber(this)
|
||||||
|
memberListAdapter.setLockedMembers(arrayListOf(userPublicKey))
|
||||||
|
|
||||||
|
mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
|
||||||
|
emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
|
||||||
|
|
||||||
|
invalidateOptionsMenu()
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Interaction
|
||||||
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
|
when(item.itemId) {
|
||||||
|
R.id.applyButton -> commitChanges()
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onMemberClick(member: String) {
|
||||||
|
val bottomSheet = ClosedGroupEditingOptionsBottomSheet()
|
||||||
|
bottomSheet.onRemoveTapped = {
|
||||||
|
val changedMembers = members - member
|
||||||
|
updateMembers(changedMembers)
|
||||||
|
bottomSheet.dismiss()
|
||||||
|
}
|
||||||
|
bottomSheet.show(supportFragmentManager, "GroupEditingOptionsBottomSheet")
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onAddMembersClick() {
|
||||||
|
val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
|
||||||
|
startActivityForResult(intent, Companion.addUsersRequestCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun saveName() {
|
||||||
|
val name = edtGroupName.text.toString().trim()
|
||||||
|
if (name.isEmpty()) {
|
||||||
|
return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_missing_error, Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
if (name.length >= 64) {
|
||||||
|
return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
this.name = name
|
||||||
|
lblGroupNameDisplay.text = name
|
||||||
|
hasNameChanged = true
|
||||||
|
isEditingName = false
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun commitChanges() {
|
||||||
|
val hasMemberListChanges = members != originalMembers
|
||||||
|
|
||||||
|
if (!hasNameChanged && !hasMemberListChanges) {
|
||||||
|
return finish()
|
||||||
|
}
|
||||||
|
|
||||||
|
val name = if (hasNameChanged) this.name else originalName
|
||||||
|
|
||||||
|
val members = this.members.map {
|
||||||
|
Recipient.from(this, Address.fromSerialized(it), false)
|
||||||
|
}.toSet()
|
||||||
|
|
||||||
|
val admins = members.toSet() //TODO For now, consider all the users to be admins.
|
||||||
|
|
||||||
|
var isSSKBasedClosedGroup: Boolean
|
||||||
|
var groupPublicKey: String?
|
||||||
|
try {
|
||||||
|
groupPublicKey = ClosedGroupsProtocol.doubleDecodeGroupID(groupID).toHexString()
|
||||||
|
isSSKBasedClosedGroup = DatabaseFactory.getSSKDatabase(this).isSSKBasedClosedGroup(groupPublicKey)
|
||||||
|
} catch (e: IOException) {
|
||||||
|
groupPublicKey = null
|
||||||
|
isSSKBasedClosedGroup = false
|
||||||
|
}
|
||||||
|
|
||||||
|
if (members.size < 2) {
|
||||||
|
return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
|
||||||
|
val maxGroupMembers = if (isSSKBasedClosedGroup) ClosedGroupsProtocol.groupSizeLimit else Companion.legacyGroupSizeLimit
|
||||||
|
if (members.size > maxGroupMembers) {
|
||||||
|
// TODO: Update copy for SSK based closed groups
|
||||||
|
return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isSSKBasedClosedGroup) {
|
||||||
|
ClosedGroupsProtocol.update(this, groupPublicKey!!, members.map { it.address.serialize() },
|
||||||
|
name, admins.map { it.address.serialize() })
|
||||||
|
} else {
|
||||||
|
GroupManager.updateGroup(this, groupID, members, null, name, admins)
|
||||||
|
}
|
||||||
|
finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.activities
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import org.thoughtcrime.securesms.database.DatabaseFactory
|
||||||
|
import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
|
||||||
|
import org.thoughtcrime.securesms.util.AsyncLoader
|
||||||
|
|
||||||
|
class EditClosedGroupLoader(context: Context, val groupID: String) : AsyncLoader<List<String>>(context) {
|
||||||
|
|
||||||
|
override fun loadInBackground(): List<String> {
|
||||||
|
val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, true)
|
||||||
|
return members.map {
|
||||||
|
it.address.toPhoneString()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.activities
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.support.v7.widget.RecyclerView
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import org.thoughtcrime.securesms.database.Address
|
||||||
|
import org.thoughtcrime.securesms.loki.views.UserView
|
||||||
|
import org.thoughtcrime.securesms.mms.GlideRequests
|
||||||
|
import org.thoughtcrime.securesms.recipients.Recipient
|
||||||
|
|
||||||
|
class EditClosedGroupMembersAdapter(
|
||||||
|
private val context: Context,
|
||||||
|
private val glide: GlideRequests,
|
||||||
|
private val memberClickListener: ((String) -> Unit)? = null
|
||||||
|
) : RecyclerView.Adapter<EditClosedGroupMembersAdapter.ViewHolder>() {
|
||||||
|
private val members = ArrayList<String>()
|
||||||
|
private val lockedMembers = HashSet<String>()
|
||||||
|
|
||||||
|
fun setMembers(members: Collection<String>) {
|
||||||
|
this.members.clear()
|
||||||
|
this.members.addAll(members)
|
||||||
|
notifyDataSetChanged()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setLockedMembers(members: Collection<String>) {
|
||||||
|
this.lockedMembers.clear()
|
||||||
|
this.lockedMembers.addAll(members)
|
||||||
|
notifyDataSetChanged()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getItemCount(): Int = members.size
|
||||||
|
|
||||||
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
||||||
|
val view = UserView(context)
|
||||||
|
return ViewHolder(view)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
|
||||||
|
val member = members[position]
|
||||||
|
|
||||||
|
val lockedMember = lockedMembers.contains(member)
|
||||||
|
|
||||||
|
viewHolder.view.bind(Recipient.from(
|
||||||
|
context,
|
||||||
|
Address.fromSerialized(member), false),
|
||||||
|
glide,
|
||||||
|
if (lockedMember) UserView.ActionIndicator.None else UserView.ActionIndicator.Menu)
|
||||||
|
|
||||||
|
if (!lockedMember) {
|
||||||
|
viewHolder.view.setOnClickListener { this.memberClickListener?.invoke(member) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ViewHolder(val view: UserView) : RecyclerView.ViewHolder(view)
|
||||||
|
}
|
||||||
@ -0,0 +1,87 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.activities
|
||||||
|
|
||||||
|
import android.app.Activity
|
||||||
|
import android.content.Intent
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.v4.app.LoaderManager
|
||||||
|
import android.support.v4.content.Loader
|
||||||
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
|
import android.view.Menu
|
||||||
|
import android.view.MenuItem
|
||||||
|
import android.view.View
|
||||||
|
import kotlinx.android.synthetic.main.activity_create_closed_group.*
|
||||||
|
import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
|
||||||
|
import network.loki.messenger.R
|
||||||
|
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
|
||||||
|
import org.thoughtcrime.securesms.mms.GlideApp
|
||||||
|
|
||||||
|
class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
|
||||||
|
private var members = listOf<String>()
|
||||||
|
set(value) { field = value; selectContactsAdapter.members = value }
|
||||||
|
|
||||||
|
private val selectContactsAdapter by lazy {
|
||||||
|
SelectContactsAdapter(this, GlideApp.with(this))
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val selectedContactsKey = "selectedContactsKey"
|
||||||
|
}
|
||||||
|
|
||||||
|
// region Lifecycle
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
|
||||||
|
super.onCreate(savedInstanceState, isReady)
|
||||||
|
|
||||||
|
setContentView(R.layout.activity_select_contacts)
|
||||||
|
supportActionBar!!.title = resources.getString(R.string.activity_select_contacts_title)
|
||||||
|
|
||||||
|
recyclerView.adapter = selectContactsAdapter
|
||||||
|
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||||
|
|
||||||
|
LoaderManager.getInstance(this).initLoader(0, null, this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||||
|
menuInflater.inflate(R.menu.menu_done, menu)
|
||||||
|
return members.isNotEmpty()
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Updating
|
||||||
|
override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
|
||||||
|
return SelectContactsLoader(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
|
||||||
|
mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
|
||||||
|
emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
|
||||||
|
invalidateOptionsMenu()
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Interaction
|
||||||
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
|
when(item.itemId) {
|
||||||
|
R.id.doneButton -> closeAndReturnSelected()
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun closeAndReturnSelected() {
|
||||||
|
val selectedMembers = selectContactsAdapter.selectedMembers
|
||||||
|
val selectedContacts = selectedMembers.toTypedArray()
|
||||||
|
val intent = Intent()
|
||||||
|
intent.putExtra(selectedContactsKey, selectedContacts)
|
||||||
|
setResult(Activity.RESULT_OK, intent)
|
||||||
|
finish()
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.dialogs
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.design.widget.BottomSheetDialogFragment
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import kotlinx.android.synthetic.main.fragment_closed_group_edit_bottom_sheet.*
|
||||||
|
import network.loki.messenger.R
|
||||||
|
|
||||||
|
public class ClosedGroupEditingOptionsBottomSheet : BottomSheetDialogFragment() {
|
||||||
|
var onRemoveTapped: (() -> Unit)? = null
|
||||||
|
|
||||||
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
|
return inflater.inflate(R.layout.fragment_closed_group_edit_bottom_sheet, container, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
removeFromGroup.setOnClickListener { onRemoveTapped?.invoke() }
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue