TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-sw400dp/fragment_enter_chat_url.xml
View File

@ -16,7 +16,7 @@
android:layout_marginLeft="@dimen/large_spacing" android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="@dimen/large_spacing" android:layout_marginTop="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:hint="https://chat.lokinet.org" /> android:hint="https://chat.getsession.org" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

14
res/layout/activity_create_closed_group.xml
View File

@ -14,9 +14,21 @@
android:layout_marginLeft="@dimen/large_spacing" android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="@dimen/medium_spacing" android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:layout_marginBottom="@dimen/large_spacing"
android:hint="Enter a group name" /> android:hint="Enter a group name" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/large_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
android:alpha="0.6"
android:textAlignment="center"
android:text="Closed groups are end-to-end encrypted group chats for up to 10 members. They provide the same privacy protections as one-on-one sessions." />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"

2
res/layout/fragment_enter_chat_url.xml
View File

@ -16,7 +16,7 @@
android:layout_marginLeft="@dimen/large_spacing" android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="@dimen/large_spacing" android:layout_marginTop="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:hint="https://chat.lokinet.org" /> android:hint="https://chat.getsession.org" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

4
res/menu/conversation_push_group_options.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- <item android:id="@+id/menu_edit_group" <item android:id="@+id/menu_edit_group"
android:title="@string/conversation__menu_edit_group" android:title="@string/conversation__menu_edit_group"
app:showAsAction="collapseActionView" /> --> app:showAsAction="collapseActionView" />
<item android:id="@+id/menu_leave" <item android:id="@+id/menu_leave"
android:title="@string/conversation__menu_leave_group" android:title="@string/conversation__menu_leave_group"

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_group_recipients: handleDisplayGroupRecipients(); return true;
case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); 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_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_leave: handleLeavePushGroup(); return true;
case R.id.menu_invite: handleInviteLink(); return true; case R.id.menu_invite: handleInviteLink(); return true;
case R.id.menu_mute_notifications: handleMuteNotifications(); return true; case R.id.menu_mute_notifications: handleMuteNotifications(); return true;
@ -1172,9 +1172,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
private void handleEditPushGroup() { private void handleEditPushGroup() {
Intent intent = new Intent(ConversationActivity.this, GroupCreateActivity.class); AlertDialog.Builder alert = new AlertDialog.Builder(this);
intent.putExtra(GroupCreateActivity.GROUP_ADDRESS_EXTRA, recipient.getAddress()); alert.setMessage("The ability to add members to a closed group is coming soon.");
startActivityForResult(intent, GROUP_EDIT); alert.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
alert.create().show();
} }
private void handleDistributionBroadcastEnabled(MenuItem item) { 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() return Toast.makeText(this, "Please enter a shorter group name", Toast.LENGTH_LONG).show()
} }
val selectedMembers = this.selectedMembers val selectedMembers = this.selectedMembers
if (selectedMembers.count() < 1) { if (selectedMembers.count() < 2) {
return Toast.makeText(this, "Please pick at least 1 group member", Toast.LENGTH_LONG).show() 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 { val recipients = selectedMembers.map {
Recipient.from(this, Address.fromSerialized(it), false) Recipient.from(this, Address.fromSerialized(it), false)