mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-21 09:20:19 +01:00
Add support for Group V2 description field.
This commit is contained in:
committed by
Greyson Parrelli
parent
b3aec58e69
commit
8c9df8d3be
@@ -62,17 +62,22 @@ public final class GroupManager {
|
||||
}
|
||||
|
||||
@WorkerThread
|
||||
public static GroupActionResult updateGroupDetails(@NonNull Context context,
|
||||
@NonNull GroupId groupId,
|
||||
@Nullable byte[] avatar,
|
||||
boolean avatarChanged,
|
||||
@NonNull String name,
|
||||
boolean nameChanged)
|
||||
throws GroupChangeFailedException, GroupInsufficientRightsException, IOException, GroupNotAMemberException, GroupChangeBusyException
|
||||
public static GroupActionResult updateGroupDetails(@NonNull Context context,
|
||||
@NonNull GroupId groupId,
|
||||
@Nullable byte[] avatar,
|
||||
boolean avatarChanged,
|
||||
@NonNull String name,
|
||||
boolean nameChanged,
|
||||
@NonNull String description,
|
||||
boolean descriptionChanged)
|
||||
throws GroupChangeFailedException, GroupInsufficientRightsException, IOException, GroupNotAMemberException, GroupChangeBusyException
|
||||
{
|
||||
if (groupId.isV2()) {
|
||||
try (GroupManagerV2.GroupEditor edit = new GroupManagerV2(context).edit(groupId.requireV2())) {
|
||||
return edit.updateGroupTitleAndAvatar(nameChanged ? name : null, avatar, avatarChanged);
|
||||
return edit.updateGroupTitleDescriptionAndAvatar(nameChanged ? name : null,
|
||||
descriptionChanged ? description : null,
|
||||
avatar,
|
||||
avatarChanged);
|
||||
}
|
||||
} else if (groupId.isV1()) {
|
||||
List<Recipient> members = DatabaseFactory.getGroupDatabase(context)
|
||||
|
||||
@@ -345,13 +345,17 @@ final class GroupManagerV2 {
|
||||
}
|
||||
|
||||
@WorkerThread
|
||||
@NonNull GroupManager.GroupActionResult updateGroupTitleAndAvatar(@Nullable String title, @Nullable byte[] avatarBytes, boolean avatarChanged)
|
||||
@NonNull GroupManager.GroupActionResult updateGroupTitleDescriptionAndAvatar(@Nullable String title, @Nullable String description, @Nullable byte[] avatarBytes, boolean avatarChanged)
|
||||
throws GroupChangeFailedException, GroupInsufficientRightsException, IOException, GroupNotAMemberException
|
||||
{
|
||||
try {
|
||||
GroupChange.Actions.Builder change = title != null ? groupOperations.createModifyGroupTitle(title)
|
||||
: GroupChange.Actions.newBuilder();
|
||||
|
||||
if (description != null) {
|
||||
change.setModifyDescription(groupOperations.createModifyGroupDescription(description));
|
||||
}
|
||||
|
||||
if (avatarChanged) {
|
||||
String cdnKey = avatarBytes != null ? groupsV2Api.uploadAvatar(avatarBytes, groupSecretParams, authorization.getAuthorizationForToday(selfUuid, groupSecretParams))
|
||||
: "";
|
||||
|
||||
@@ -125,6 +125,10 @@ public final class LiveGroup {
|
||||
});
|
||||
}
|
||||
|
||||
public LiveData<String> getDescription() {
|
||||
return Transformations.map(groupRecord, GroupDatabase.GroupRecord::getDescription);
|
||||
}
|
||||
|
||||
public LiveData<Recipient> getGroupRecipient() {
|
||||
return recipient;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package org.thoughtcrime.securesms.groups;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
public final class ParcelableGroupId implements Parcelable {
|
||||
|
||||
private final GroupId groupId;
|
||||
|
||||
public static Parcelable from(@Nullable GroupId groupId) {
|
||||
return new ParcelableGroupId(groupId);
|
||||
}
|
||||
|
||||
public static @Nullable GroupId get(@Nullable ParcelableGroupId parcelableGroupId) {
|
||||
if (parcelableGroupId == null) {
|
||||
return null;
|
||||
}
|
||||
return parcelableGroupId.groupId;
|
||||
}
|
||||
|
||||
ParcelableGroupId(@Nullable GroupId groupId) {
|
||||
this.groupId = groupId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToParcel(Parcel dest, int flags) {
|
||||
if (groupId != null) {
|
||||
dest.writeString(groupId.toString());
|
||||
} else {
|
||||
dest.writeString(null);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int describeContents() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static final Creator<ParcelableGroupId> CREATOR = new Creator<ParcelableGroupId>() {
|
||||
@Override
|
||||
public ParcelableGroupId createFromParcel(Parcel in) {
|
||||
return new ParcelableGroupId(GroupId.parseNullableOrThrow(in.readString()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ParcelableGroupId[] newArray(int size) {
|
||||
return new ParcelableGroupId[size];
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -21,6 +21,10 @@ public final class GroupDetails {
|
||||
return joinInfo.getTitle();
|
||||
}
|
||||
|
||||
public @NonNull String getGroupDescription() {
|
||||
return joinInfo.getDescription();
|
||||
}
|
||||
|
||||
public @Nullable byte[] getAvatarBytes() {
|
||||
return avatarBytes;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.groups.ui.invitesandrequests.joining;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.text.method.LinkMovementMethod;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@@ -26,6 +28,8 @@ import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
|
||||
import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
|
||||
import org.thoughtcrime.securesms.conversation.ConversationIntents;
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||
import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupDescriptionDialog;
|
||||
import org.thoughtcrime.securesms.groups.v2.GroupDescriptionUtil;
|
||||
import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
|
||||
import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
|
||||
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||
@@ -42,6 +46,7 @@ public final class GroupJoinBottomSheetDialogFragment extends BottomSheetDialogF
|
||||
private AvatarImageView avatar;
|
||||
private TextView groupName;
|
||||
private TextView groupDetails;
|
||||
private TextView groupDescription;
|
||||
private TextView groupJoinExplain;
|
||||
private Button groupJoinButton;
|
||||
private Button groupCancelButton;
|
||||
@@ -76,6 +81,7 @@ public final class GroupJoinBottomSheetDialogFragment extends BottomSheetDialogF
|
||||
busy = view.findViewById(R.id.group_join_busy);
|
||||
avatar = view.findViewById(R.id.group_join_recipient_avatar);
|
||||
groupName = view.findViewById(R.id.group_join_group_name);
|
||||
groupDescription = view.findViewById(R.id.group_join_group_description);
|
||||
groupDetails = view.findViewById(R.id.group_join_group_details);
|
||||
groupJoinExplain = view.findViewById(R.id.group_join_explain);
|
||||
|
||||
@@ -98,6 +104,10 @@ public final class GroupJoinBottomSheetDialogFragment extends BottomSheetDialogF
|
||||
groupName.setText(details.getGroupName());
|
||||
groupDetails.setText(requireContext().getResources().getQuantityString(R.plurals.GroupJoinBottomSheetDialogFragment_group_dot_d_members, details.getGroupMembershipCount(), details.getGroupMembershipCount()));
|
||||
|
||||
if (!TextUtils.isEmpty(details.getGroupDescription())) {
|
||||
updateGroupDescription(details.getGroupName(), details.getGroupDescription());
|
||||
}
|
||||
|
||||
switch (getGroupJoinStatus()) {
|
||||
case UPDATE_LINKED_DEVICE_TO_JOIN:
|
||||
groupJoinExplain.setText(R.string.GroupJoinUpdateRequiredBottomSheetDialogFragment_update_linked_device_message);
|
||||
@@ -145,6 +155,15 @@ public final class GroupJoinBottomSheetDialogFragment extends BottomSheetDialogF
|
||||
);
|
||||
}
|
||||
|
||||
private void updateGroupDescription(@NonNull String name, @NonNull String description) {
|
||||
groupDescription.setVisibility(View.VISIBLE);
|
||||
groupDescription.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
groupDescription.setText(GroupDescriptionUtil.style(requireContext(),
|
||||
description,
|
||||
true,
|
||||
() -> GroupDescriptionDialog.show(getChildFragmentManager(), name, description, true)));
|
||||
}
|
||||
|
||||
private static ExtendedGroupJoinStatus getGroupJoinStatus() {
|
||||
if (Recipient.self().getGroupsV2Capability() != Recipient.Capability.SUPPORTED) {
|
||||
return ExtendedGroupJoinStatus.UPDATE_LINKED_DEVICE_TO_JOIN;
|
||||
|
||||
@@ -5,6 +5,8 @@ import android.content.Intent;
|
||||
import android.database.Cursor;
|
||||
import android.graphics.Color;
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.text.method.LinkMovementMethod;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
@@ -17,7 +19,6 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.widget.SwitchCompat;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.lifecycle.ViewModelProviders;
|
||||
|
||||
@@ -35,6 +36,7 @@ import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.color.MaterialColor;
|
||||
import org.thoughtcrime.securesms.components.AvatarImageView;
|
||||
import org.thoughtcrime.securesms.components.ThreadPhotoRailView;
|
||||
import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
|
||||
import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
|
||||
import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto80dp;
|
||||
import org.thoughtcrime.securesms.groups.GroupId;
|
||||
@@ -43,10 +45,12 @@ import org.thoughtcrime.securesms.groups.ui.GroupErrors;
|
||||
import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
|
||||
import org.thoughtcrime.securesms.groups.ui.LeaveGroupDialog;
|
||||
import org.thoughtcrime.securesms.groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity;
|
||||
import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupDescriptionDialog;
|
||||
import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupInviteSentDialog;
|
||||
import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupRightsDialog;
|
||||
import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupsLearnMoreBottomSheetDialogFragment;
|
||||
import org.thoughtcrime.securesms.groups.ui.migration.GroupsV1MigrationInitiationBottomSheetDialogFragment;
|
||||
import org.thoughtcrime.securesms.groups.v2.GroupDescriptionUtil;
|
||||
import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
|
||||
import org.thoughtcrime.securesms.mms.GlideApp;
|
||||
import org.thoughtcrime.securesms.notifications.NotificationChannels;
|
||||
@@ -84,6 +88,7 @@ public class ManageGroupFragment extends LoggingFragment {
|
||||
private TextView pendingAndRequestingCount;
|
||||
private Toolbar toolbar;
|
||||
private TextView groupName;
|
||||
private EmojiTextView groupDescription;
|
||||
private LearnMoreTextView groupInfoText;
|
||||
private TextView memberCountUnderAvatar;
|
||||
private TextView memberCountAboveList;
|
||||
@@ -145,6 +150,7 @@ public class ManageGroupFragment extends LoggingFragment {
|
||||
avatar = view.findViewById(R.id.group_avatar);
|
||||
toolbar = view.findViewById(R.id.toolbar);
|
||||
groupName = view.findViewById(R.id.name);
|
||||
groupDescription = view.findViewById(R.id.manage_group_description);
|
||||
groupInfoText = view.findViewById(R.id.manage_group_info_text);
|
||||
memberCountUnderAvatar = view.findViewById(R.id.member_count);
|
||||
memberCountAboveList = view.findViewById(R.id.member_count_2);
|
||||
@@ -233,6 +239,7 @@ public class ManageGroupFragment extends LoggingFragment {
|
||||
});
|
||||
|
||||
viewModel.getTitle().observe(getViewLifecycleOwner(), groupName::setText);
|
||||
viewModel.getDescription().observe(getViewLifecycleOwner(), this::updateGroupDescription);
|
||||
viewModel.getMemberCountSummary().observe(getViewLifecycleOwner(), memberCountUnderAvatar::setText);
|
||||
viewModel.getFullMemberCountSummary().observe(getViewLifecycleOwner(), memberCountAboveList::setText);
|
||||
viewModel.getGroupRecipient().observe(getViewLifecycleOwner(), groupRecipient -> {
|
||||
@@ -432,6 +439,31 @@ public class ManageGroupFragment extends LoggingFragment {
|
||||
}
|
||||
}
|
||||
|
||||
private void updateGroupDescription(@NonNull ManageGroupViewModel.Description description) {
|
||||
if (!TextUtils.isEmpty(description.getDescription()) || (FeatureFlags.groupsV2Description() && description.canEditDescription())) {
|
||||
groupDescription.setVisibility(View.VISIBLE);
|
||||
groupDescription.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
memberCountUnderAvatar.setVisibility(View.GONE);
|
||||
} else {
|
||||
groupDescription.setVisibility(View.GONE);
|
||||
groupDescription.setMovementMethod(null);
|
||||
memberCountUnderAvatar.setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(description.getDescription())) {
|
||||
if (FeatureFlags.groupsV2Description() && description.canEditDescription()) {
|
||||
groupDescription.setText(R.string.ManageGroupActivity_add_group_description);
|
||||
groupDescription.setOnClickListener(v -> startActivity(EditProfileActivity.getIntentForGroupProfile(requireActivity(), getGroupId())));
|
||||
}
|
||||
} else {
|
||||
groupDescription.setOnClickListener(null);
|
||||
groupDescription.setText(GroupDescriptionUtil.style(requireContext(),
|
||||
description.getDescription(),
|
||||
description.shouldLinkifyWebLinks(),
|
||||
() -> GroupDescriptionDialog.show(getChildFragmentManager(), getGroupId(), null, description.shouldLinkifyWebLinks())));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
|
||||
@@ -46,6 +46,7 @@ import org.thoughtcrime.securesms.util.DefaultValueLiveData;
|
||||
import org.thoughtcrime.securesms.util.ExpirationUtil;
|
||||
import org.thoughtcrime.securesms.util.FeatureFlags;
|
||||
import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
|
||||
import org.thoughtcrime.securesms.util.livedata.Store;
|
||||
import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -59,6 +60,8 @@ public class ManageGroupViewModel extends ViewModel {
|
||||
private final Context context;
|
||||
private final ManageGroupRepository manageGroupRepository;
|
||||
private final LiveData<String> title;
|
||||
private final Store<Description> descriptionStore;
|
||||
private final LiveData<Description> description;
|
||||
private final LiveData<Boolean> isAdmin;
|
||||
private final LiveData<Boolean> canEditGroupAttributes;
|
||||
private final LiveData<Boolean> canAddMembers;
|
||||
@@ -71,11 +74,11 @@ public class ManageGroupViewModel extends ViewModel {
|
||||
private final LiveData<GroupAccessControl> editMembershipRights;
|
||||
private final LiveData<GroupAccessControl> editGroupAttributesRights;
|
||||
private final LiveData<Recipient> groupRecipient;
|
||||
private final MutableLiveData<GroupViewState> groupViewState = new MutableLiveData<>(null);
|
||||
private final MutableLiveData<GroupViewState> groupViewState = new MutableLiveData<>(null);
|
||||
private final LiveData<MuteState> muteState;
|
||||
private final LiveData<Boolean> hasCustomNotifications;
|
||||
private final LiveData<Boolean> canCollapseMemberList;
|
||||
private final DefaultValueLiveData<CollapseState> memberListCollapseState = new DefaultValueLiveData<>(CollapseState.COLLAPSED);
|
||||
private final DefaultValueLiveData<CollapseState> memberListCollapseState = new DefaultValueLiveData<>(CollapseState.COLLAPSED);
|
||||
private final LiveData<Boolean> canLeaveGroup;
|
||||
private final LiveData<Boolean> canBlockGroup;
|
||||
private final LiveData<Boolean> canUnblockGroup;
|
||||
@@ -140,6 +143,15 @@ public class ManageGroupViewModel extends ViewModel {
|
||||
return GroupInfoMessage.NONE;
|
||||
}
|
||||
});
|
||||
|
||||
this.descriptionStore = new Store<>(Description.NONE);
|
||||
this.description = groupId.isV2() ? this.descriptionStore.getStateLiveData() : LiveDataUtil.empty();
|
||||
|
||||
if (groupId.isV2()) {
|
||||
this.descriptionStore.update(liveGroup.getDescription(), (description, state) -> new Description(description, state.shouldLinkifyWebLinks, state.canEditDescription));
|
||||
this.descriptionStore.update(LiveDataUtil.mapAsync(groupRecipient, r -> RecipientUtil.isMessageRequestAccepted(context, r)), (linkify, state) -> new Description(state.description, linkify, state.canEditDescription));
|
||||
this.descriptionStore.update(this.canEditGroupAttributes, (canEdit, state) -> new Description(state.description, state.shouldLinkifyWebLinks, canEdit));
|
||||
}
|
||||
}
|
||||
|
||||
@WorkerThread
|
||||
@@ -181,6 +193,10 @@ public class ManageGroupViewModel extends ViewModel {
|
||||
return title;
|
||||
}
|
||||
|
||||
LiveData<Description> getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
LiveData<MuteState> getMuteState() {
|
||||
return muteState;
|
||||
}
|
||||
@@ -419,6 +435,32 @@ public class ManageGroupViewModel extends ViewModel {
|
||||
Cursor create();
|
||||
}
|
||||
|
||||
public static class Description {
|
||||
private static final Description NONE = new Description("", false, false);
|
||||
|
||||
private final String description;
|
||||
private final boolean shouldLinkifyWebLinks;
|
||||
private final boolean canEditDescription;
|
||||
|
||||
public Description(String description, boolean shouldLinkifyWebLinks, boolean canEditDescription) {
|
||||
this.description = description;
|
||||
this.shouldLinkifyWebLinks = shouldLinkifyWebLinks;
|
||||
this.canEditDescription = canEditDescription;
|
||||
}
|
||||
|
||||
public @NonNull String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public boolean shouldLinkifyWebLinks() {
|
||||
return shouldLinkifyWebLinks;
|
||||
}
|
||||
|
||||
public boolean canEditDescription() {
|
||||
return canEditDescription;
|
||||
}
|
||||
}
|
||||
|
||||
public static class Factory implements ViewModelProvider.Factory {
|
||||
private final Context context;
|
||||
private final GroupId groupId;
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
package org.thoughtcrime.securesms.groups.ui.managegroup.dialogs;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.text.method.LinkMovementMethod;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.groups.GroupId;
|
||||
import org.thoughtcrime.securesms.groups.LiveGroup;
|
||||
import org.thoughtcrime.securesms.groups.ParcelableGroupId;
|
||||
import org.thoughtcrime.securesms.groups.v2.GroupDescriptionUtil;
|
||||
|
||||
/**
|
||||
* Dialog to show a full group description. Information regarding the description can be provided
|
||||
* as arguments, or a {@link GroupId} can be provided and the dialog will load it. If both are provided,
|
||||
* the title/description from the arguments takes precedence.
|
||||
*/
|
||||
public final class GroupDescriptionDialog extends DialogFragment {
|
||||
|
||||
private static final String ARGUMENT_GROUP_ID = "group_id";
|
||||
private static final String ARGUMENT_TITLE = "title";
|
||||
private static final String ARGUMENT_DESCRIPTION = "description";
|
||||
private static final String ARGUMENT_LINKIFY = "linkify";
|
||||
private static final String DIALOG_TAG = "GroupDescriptionDialog";
|
||||
|
||||
private TextView descriptionText;
|
||||
|
||||
public static void show(@NonNull FragmentManager fragmentManager, @NonNull String title, @Nullable String description, boolean linkify) {
|
||||
show(fragmentManager, null, title, description, linkify);
|
||||
}
|
||||
|
||||
public static void show(@NonNull FragmentManager fragmentManager, @NonNull GroupId groupId, @Nullable String description, boolean linkify) {
|
||||
show(fragmentManager, groupId, null, description, linkify);
|
||||
}
|
||||
|
||||
private static void show(@NonNull FragmentManager fragmentManager, @Nullable GroupId groupId, @Nullable String title, @Nullable String description, boolean linkify) {
|
||||
Bundle arguments = new Bundle();
|
||||
arguments.putParcelable(ARGUMENT_GROUP_ID, ParcelableGroupId.from(groupId));
|
||||
arguments.putString(ARGUMENT_TITLE, title);
|
||||
arguments.putString(ARGUMENT_DESCRIPTION, description);
|
||||
arguments.putBoolean(ARGUMENT_LINKIFY, linkify);
|
||||
|
||||
GroupDescriptionDialog dialogFragment = new GroupDescriptionDialog();
|
||||
dialogFragment.setArguments(arguments);
|
||||
|
||||
dialogFragment.show(fragmentManager, DIALOG_TAG);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
|
||||
View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.group_description_dialog, null, false);
|
||||
String argumentTitle = requireArguments().getString(ARGUMENT_TITLE, null);
|
||||
String argumentDescription = requireArguments().getString(ARGUMENT_DESCRIPTION, null);
|
||||
GroupId argumentGroupId = ParcelableGroupId.get(requireArguments().getParcelable(ARGUMENT_GROUP_ID));
|
||||
boolean linkify = requireArguments().getBoolean(ARGUMENT_LINKIFY, false);
|
||||
LiveGroup liveGroup = argumentGroupId != null ? new LiveGroup(argumentGroupId) : null;
|
||||
|
||||
descriptionText = dialogView.findViewById(R.id.group_description_dialog_text);
|
||||
descriptionText.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext(), R.style.Signal_ThemeOverlay_Dialog_Rounded);
|
||||
Dialog dialog = builder.setTitle(TextUtils.isEmpty(argumentTitle) ? getString(R.string.GroupDescriptionDialog__group_description) : argumentTitle)
|
||||
.setView(dialogView)
|
||||
.setPositiveButton(android.R.string.ok, null)
|
||||
.create();
|
||||
|
||||
if (argumentDescription != null) {
|
||||
descriptionText.setText(GroupDescriptionUtil.style(requireContext(), argumentDescription, linkify, null));
|
||||
} else if (liveGroup != null) {
|
||||
liveGroup.getDescription().observe(this, d -> descriptionText.setText(GroupDescriptionUtil.style(requireContext(), d, linkify, null)));
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(argumentTitle) && liveGroup != null) {
|
||||
liveGroup.getTitle().observe(this, dialog::setTitle);
|
||||
}
|
||||
|
||||
return dialog;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package org.thoughtcrime.securesms.groups.v2;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Typeface;
|
||||
import android.text.Spannable;
|
||||
import android.text.SpannableString;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.Spanned;
|
||||
import android.text.TextPaint;
|
||||
import android.text.style.ClickableSpan;
|
||||
import android.text.style.URLSpan;
|
||||
import android.text.util.Linkify;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.annimon.stream.Stream;
|
||||
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
|
||||
|
||||
public final class GroupDescriptionUtil {
|
||||
|
||||
public static final int MAX_DESCRIPTION_LENGTH = 80;
|
||||
|
||||
/**
|
||||
* Style a group description.
|
||||
*
|
||||
* @param description full description
|
||||
* @param linkify flag indicating if web urls should be linkified
|
||||
* @param moreClick Callback for when truncating and need to show more via another means. Required to enable truncating.
|
||||
* @return styled group description
|
||||
*/
|
||||
public static @NonNull Spannable style(@NonNull Context context, @NonNull String description, boolean linkify, @Nullable Runnable moreClick) {
|
||||
SpannableString descriptionSpannable = new SpannableString(description);
|
||||
|
||||
if (linkify) {
|
||||
int linkPattern = Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS;
|
||||
boolean hasLinks = Linkify.addLinks(descriptionSpannable, linkPattern);
|
||||
|
||||
if (hasLinks) {
|
||||
Stream.of(descriptionSpannable.getSpans(0, descriptionSpannable.length(), URLSpan.class))
|
||||
.filterNot(url -> LinkPreviewUtil.isLegalUrl(url.getURL()))
|
||||
.forEach(descriptionSpannable::removeSpan);
|
||||
}
|
||||
}
|
||||
|
||||
if (moreClick != null && descriptionSpannable.length() > MAX_DESCRIPTION_LENGTH) {
|
||||
ClickableSpan style = new ClickableSpan() {
|
||||
@Override
|
||||
public void onClick(@NonNull View widget) {
|
||||
moreClick.run();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDrawState(@NonNull TextPaint ds) {
|
||||
ds.setTypeface(Typeface.DEFAULT_BOLD);
|
||||
}
|
||||
};
|
||||
|
||||
SpannableStringBuilder builder = new SpannableStringBuilder(descriptionSpannable.subSequence(0, MAX_DESCRIPTION_LENGTH)).append(context.getString(R.string.ManageGroupActivity_more));
|
||||
builder.setSpan(style, MAX_DESCRIPTION_LENGTH + 1, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
return builder;
|
||||
}
|
||||
|
||||
return descriptionSpannable;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user