diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
index 8da49fdac6..04cd00ad85 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@@ -233,16 +233,16 @@ class ConversationViewModel(
return
}
- //todo DELETION handle multi select scenarios
-
viewModelScope.launch(Dispatchers.IO) {
val allSentByCurrentUser = messages.all { it.isOutgoing }
val conversationType = conversation.getType()
- // hashes are required if wanting to delete messages from the 'storage server' - they are not required for communities
+ // hashes are required if wanting to delete messages from the 'storage server'
+ // They are not required for communities OR if all messages are outgoing
// also we can only delete deleted messages (marked as deleted) locally
val canDeleteForEveryone = messages.all{ !it.isDeleted } && (
+ messages.all { it.isOutgoing } ||
conversationType == MessageType.COMMUNITY ||
messages.all { lokiMessageDb.getMessageServerHash(it.id, it.isMms) != null
})
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index d1d99d4327..4c6eec2c14 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -2,11 +2,12 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="50"
- android:viewportHeight="50">
+ android:viewportHeight="50"
+ android:tint="?attr/colorControlNormal">
+ android:fillColor="#FFFFFF"/>
+ android:fillColor="#FFFFFF"/>