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

Fix blinded ID moderator checks in emoji reaction popup (#964)

Browse Source 
* fix: emoji popup now uses blinded ID as well

* fix: add conversation menu handling for ban and delete all actions, as well as add placeholder icons
This commit is contained in:
Harris 2022-09-13 14:17:47 +10:00 committed by GitHub
parent 29124f36b6
commit bdc4f5aebe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@ -989,7 +989,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
Log.e("Loki", "Failed to show emoji picker", e) Log.e("Loki", "Failed to show emoji picker", e)
return return
} }
ViewUtil.hideKeyboard(this, visibleMessageView); ViewUtil.hideKeyboard(this, visibleMessageView)
binding?.reactionsShade?.isVisible = true binding?.reactionsShade?.isVisible = true
showOrHidScrollToBottomButton(false) showOrHidScrollToBottomButton(false)
binding?.conversationRecyclerView?.suppressLayout(true) binding?.conversationRecyclerView?.suppressLayout(true)
@ -1020,7 +1020,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
message.isOutgoing, message.isOutgoing,
visibleMessageView.messageContentView visibleMessageView.messageContentView
) )
reactionDelegate.show(this, message, selectedConversationModel) reactionDelegate.show(this, message, selectedConversationModel, viewModel.blindedPublicKey)
} }
override fun dispatchTouchEvent(ev: MotionEvent): Boolean { override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
@ -1802,6 +1802,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
ConversationReactionOverlay.Action.VIEW_INFO -> showMessageDetail(selectedItems) ConversationReactionOverlay.Action.VIEW_INFO -> showMessageDetail(selectedItems)
ConversationReactionOverlay.Action.SELECT -> selectMessages(selectedItems) ConversationReactionOverlay.Action.SELECT -> selectMessages(selectedItems)
ConversationReactionOverlay.Action.DELETE -> deleteMessages(selectedItems) ConversationReactionOverlay.Action.DELETE -> deleteMessages(selectedItems)
ConversationReactionOverlay.Action.BAN_AND_DELETE_ALL -> banAndDeleteAll(selectedItems)
ConversationReactionOverlay.Action.BAN_USER -> banUser(selectedItems)
} }
} }
} }

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionDelegate.kt
View File

@ -27,13 +27,15 @@ internal class ConversationReactionDelegate(private val overlayStub: Stub<Conver
fun show( fun show(
activity: Activity, activity: Activity,
messageRecord: MessageRecord, messageRecord: MessageRecord,
selectedConversationModel: SelectedConversationModel selectedConversationModel: SelectedConversationModel,
blindedPublicKey: String?
) { ) {
resolveOverlay().show( resolveOverlay().show(
activity, activity,
messageRecord, messageRecord,
lastSeenDownPoint, lastSeenDownPoint,
selectedConversationModel selectedConversationModel,
blindedPublicKey
) )
} }

15
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java
View File

@ -68,6 +68,7 @@ public final class ConversationReactionOverlay extends FrameLayout {
private Activity activity; private Activity activity;
private MessageRecord messageRecord; private MessageRecord messageRecord;
private SelectedConversationModel selectedConversationModel; private SelectedConversationModel selectedConversationModel;
private String blindedPublicKey;
private OverlayState overlayState = OverlayState.HIDDEN; private OverlayState overlayState = OverlayState.HIDDEN;
private RecentEmojiPageModel recentEmojiPageModel; private RecentEmojiPageModel recentEmojiPageModel;
@ -142,7 +143,8 @@ public final class ConversationReactionOverlay extends FrameLayout {
public void show(@NonNull Activity activity, public void show(@NonNull Activity activity,
@NonNull MessageRecord messageRecord, @NonNull MessageRecord messageRecord,
@NonNull PointF lastSeenDownPoint, @NonNull PointF lastSeenDownPoint,
@NonNull SelectedConversationModel selectedConversationModel) @NonNull SelectedConversationModel selectedConversationModel,
@Nullable String blindedPublicKey)
{ {
if (overlayState != OverlayState.HIDDEN) { if (overlayState != OverlayState.HIDDEN) {
return; return;
@ -150,6 +152,7 @@ public final class ConversationReactionOverlay extends FrameLayout {
this.messageRecord = messageRecord; this.messageRecord = messageRecord;
this.selectedConversationModel = selectedConversationModel; this.selectedConversationModel = selectedConversationModel;
this.blindedPublicKey = blindedPublicKey;
overlayState = OverlayState.UNINITAILIZED; overlayState = OverlayState.UNINITAILIZED;
selected = -1; selected = -1;
recentEmojiPageModel = new RecentEmojiPageModel(activity); recentEmojiPageModel = new RecentEmojiPageModel(activity);
@ -668,16 +671,16 @@ public final class ConversationReactionOverlay extends FrameLayout {
items.add(new ActionItem(R.attr.menu_copy_icon, getContext().getResources().getString(R.string.activity_conversation_menu_copy_session_id), () -> handleActionItemClicked(Action.COPY_SESSION_ID))); items.add(new ActionItem(R.attr.menu_copy_icon, getContext().getResources().getString(R.string.activity_conversation_menu_copy_session_id), () -> handleActionItemClicked(Action.COPY_SESSION_ID)));
} }
// Delete message // Delete message
if (ConversationMenuItemHelper.userCanDeleteSelectedItems(getContext(), message, openGroup, userPublicKey)) { if (ConversationMenuItemHelper.userCanDeleteSelectedItems(getContext(), message, openGroup, userPublicKey, blindedPublicKey)) {
items.add(new ActionItem(R.attr.menu_trash_icon, getContext().getResources().getString(R.string.delete), () -> handleActionItemClicked(Action.DELETE))); items.add(new ActionItem(R.attr.menu_trash_icon, getContext().getResources().getString(R.string.delete), () -> handleActionItemClicked(Action.DELETE)));
} }
// Ban user // Ban user
if (ConversationMenuItemHelper.userCanBanSelectedUsers(getContext(), message, openGroup, userPublicKey)) { if (ConversationMenuItemHelper.userCanBanSelectedUsers(getContext(), message, openGroup, userPublicKey, blindedPublicKey)) {
items.add(new ActionItem(0, getContext().getResources().getString(R.string.conversation_context__menu_ban_user), () -> handleActionItemClicked(Action.BAN_USER))); items.add(new ActionItem(R.attr.menu_block_icon, getContext().getResources().getString(R.string.conversation_context__menu_ban_user), () -> handleActionItemClicked(Action.BAN_USER)));
} }
// Ban and delete all // Ban and delete all
if (ConversationMenuItemHelper.userCanBanSelectedUsers(getContext(), message, openGroup, userPublicKey)) { if (ConversationMenuItemHelper.userCanBanSelectedUsers(getContext(), message, openGroup, userPublicKey, blindedPublicKey)) {
items.add(new ActionItem(0, getContext().getResources().getString(R.string.conversation_context__menu_ban_and_delete_all), () -> handleActionItemClicked(Action.BAN_AND_DELETE_ALL))); items.add(new ActionItem(R.attr.menu_trash_icon, getContext().getResources().getString(R.string.conversation_context__menu_ban_and_delete_all), () -> handleActionItemClicked(Action.BAN_AND_DELETE_ALL)));
} }
// Message detail // Message detail
if (message.isFailed()) { if (message.isFailed()) {

8
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuItemHelper.kt
View File

@ -8,17 +8,17 @@ import org.thoughtcrime.securesms.groups.OpenGroupManager
object ConversationMenuItemHelper { object ConversationMenuItemHelper {
@JvmStatic @JvmStatic
fun userCanDeleteSelectedItems(context: Context, message: MessageRecord, openGroup: OpenGroup?, userPublicKey: String): Boolean { fun userCanDeleteSelectedItems(context: Context, message: MessageRecord, openGroup: OpenGroup?, userPublicKey: String, blindedPublicKey: String?): Boolean {
if (openGroup == null) return message.isOutgoing || !message.isOutgoing if (openGroup == null) return message.isOutgoing || !message.isOutgoing
if (message.isOutgoing) return true if (message.isOutgoing) return true
return OpenGroupManager.isUserModerator(context, openGroup.groupId, userPublicKey) return OpenGroupManager.isUserModerator(context, openGroup.groupId, userPublicKey, blindedPublicKey)
} }
@JvmStatic @JvmStatic
fun userCanBanSelectedUsers(context: Context, message: MessageRecord, openGroup: OpenGroup?, userPublicKey: String): Boolean { fun userCanBanSelectedUsers(context: Context, message: MessageRecord, openGroup: OpenGroup?, userPublicKey: String, blindedPublicKey: String?): Boolean {
if (openGroup == null) return false if (openGroup == null) return false
if (message.isOutgoing) return false // Users can't ban themselves if (message.isOutgoing) return false // Users can't ban themselves
return OpenGroupManager.isUserModerator(context, openGroup.groupId, userPublicKey) return OpenGroupManager.isUserModerator(context, openGroup.groupId, userPublicKey, blindedPublicKey)
} }
} }