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

Debug

Browse Source
This commit is contained in:
Niels Andriesse
2020-02-05 10:36:26 +11:00
parent 1fb7081fa2
commit 7036706485
6 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -874,7 +874,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true;
case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true;
case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true;
// case R.id.menu_edit_group: handleEditPushGroup(); return true;
case R.id.menu_edit_group: handleEditPushGroup(); return true;
case R.id.menu_leave: handleLeavePushGroup(); return true;
case R.id.menu_invite: handleInviteLink(); return true;
case R.id.menu_mute_notifications: handleMuteNotifications(); return true;
@@ -1172,9 +1172,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
private void handleEditPushGroup() {
Intent intent = new Intent(ConversationActivity.this, GroupCreateActivity.class);
intent.putExtra(GroupCreateActivity.GROUP_ADDRESS_EXTRA, recipient.getAddress());
startActivityForResult(intent, GROUP_EDIT);
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setMessage("The ability to add members to a closed group is coming soon.");
alert.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
alert.create().show();
}
private void handleDistributionBroadcastEnabled(MenuItem item) {

7
src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt
View File

@@ -95,8 +95,11 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
return Toast.makeText(this, "Please enter a shorter group name", Toast.LENGTH_LONG).show()
}
val selectedMembers = this.selectedMembers
if (selectedMembers.count() < 1) {
return Toast.makeText(this, "Please pick at least 1 group member", Toast.LENGTH_LONG).show()
if (selectedMembers.count() < 2) {
return Toast.makeText(this, "Please pick at least 2 group members", Toast.LENGTH_LONG).show()
}
if (selectedMembers.count() > 10) {
return Toast.makeText(this, "A closed group cannot have more than 10 members", Toast.LENGTH_LONG).show()
}
val recipients = selectedMembers.map {
Recipient.from(this, Address.fromSerialized(it), false)