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

Merge branch 'dev' of https://github.com/loki-project/session-android into attachment-in-conversation-preview

Browse Source
This commit is contained in:
Ryan ZHAO
2020-09-03 14:41:09 +10:00
parent f42855f43e cac5bd1834
commit bf272787fe
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
View File

@@ -186,6 +186,12 @@ class PublicChatPoller(private val context: Context, private val group: PublicCh
}
fun processOutgoingMessage(message: PublicChatMessage) {
val messageServerID = message.serverID ?: return
val messageID = DatabaseFactory.getLokiMessageDatabase(context).getMessageID(messageServerID)
var isDuplicate = false
if (messageID != null) {
isDuplicate = DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(messageID) > 0 || DatabaseFactory.getSmsDatabase(context).getThreadIdForMessage(messageID) > 0
}
if (isDuplicate) { return }
if (message.body.isEmpty() && message.attachments.isEmpty() && message.quote == null) { return }
val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
val dataMessage = getDataMessage(message)

4
src/org/thoughtcrime/securesms/util/MediaUtil.java
View File

@@ -226,7 +226,9 @@ public class MediaUtil {
}
public static boolean isImageType(String contentType) {
return (null != contentType) && contentType.startsWith("image/");
return (null != contentType)
&& contentType.startsWith("image/")
&& !contentType.contains("svg"); // Do not treat SVGs as regular images.
}
public static boolean isAudioType(String contentType) {