fixed GNU social media preview
This commit is contained in:
parent
a0cea8d2b1
commit
d3778c22e4
|
@ -0,0 +1,48 @@
|
||||||
|
/*
|
||||||
|
* Twidere - Twitter client for Android
|
||||||
|
*
|
||||||
|
* Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.mariotaku.twidere.extension.model.api.gnusocial
|
||||||
|
|
||||||
|
import org.mariotaku.microblog.library.gnusocial.model.Attachment
|
||||||
|
import org.mariotaku.twidere.model.ParcelableMedia
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by mariotaku on 2017/4/30.
|
||||||
|
*/
|
||||||
|
fun Attachment.toParcelable(externalUrl: String) : ParcelableMedia? {
|
||||||
|
val mimeType = mimetype ?: return null
|
||||||
|
val result = ParcelableMedia()
|
||||||
|
|
||||||
|
if (mimeType.startsWith("image/")) {
|
||||||
|
result.type = ParcelableMedia.Type.IMAGE
|
||||||
|
} else if (mimeType.startsWith("video/")) {
|
||||||
|
result.type = ParcelableMedia.Type.VIDEO
|
||||||
|
} else {
|
||||||
|
// https://github.com/TwidereProject/Twidere-Android/issues/729
|
||||||
|
// Skip unsupported attachment
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
result.width = width
|
||||||
|
result.height = height
|
||||||
|
result.url = externalUrl ?: url
|
||||||
|
result.page_url = externalUrl ?: url
|
||||||
|
result.media_url = url
|
||||||
|
result.preview_url = largeThumbUrl
|
||||||
|
return result
|
||||||
|
}
|
|
@ -1,10 +1,10 @@
|
||||||
package org.mariotaku.twidere.model.util
|
package org.mariotaku.twidere.model.util
|
||||||
|
|
||||||
import android.text.TextUtils
|
|
||||||
import org.mariotaku.ktextension.addAllTo
|
import org.mariotaku.ktextension.addAllTo
|
||||||
import org.mariotaku.ktextension.isNullOrEmpty
|
import org.mariotaku.ktextension.isNullOrEmpty
|
||||||
import org.mariotaku.ktextension.toIntOr
|
import org.mariotaku.ktextension.toIntOr
|
||||||
import org.mariotaku.microblog.library.twitter.model.*
|
import org.mariotaku.microblog.library.twitter.model.*
|
||||||
|
import org.mariotaku.twidere.extension.model.api.gnusocial.toParcelable
|
||||||
import org.mariotaku.twidere.extension.model.toParcelable
|
import org.mariotaku.twidere.extension.model.toParcelable
|
||||||
import org.mariotaku.twidere.model.ParcelableMedia
|
import org.mariotaku.twidere.model.ParcelableMedia
|
||||||
import org.mariotaku.twidere.model.ParcelableStatus
|
import org.mariotaku.twidere.model.ParcelableStatus
|
||||||
|
@ -88,27 +88,7 @@ object ParcelableMediaUtils {
|
||||||
private fun fromAttachments(status: Status): Array<ParcelableMedia> {
|
private fun fromAttachments(status: Status): Array<ParcelableMedia> {
|
||||||
val attachments = status.attachments ?: return emptyArray()
|
val attachments = status.attachments ?: return emptyArray()
|
||||||
val externalUrl = status.externalUrl
|
val externalUrl = status.externalUrl
|
||||||
return attachments.mapNotNull { attachment ->
|
return attachments.mapNotNull { it.toParcelable(externalUrl) }.toTypedArray()
|
||||||
val mimeType = attachment.mimetype ?: return@mapNotNull null
|
|
||||||
val media = ParcelableMedia()
|
|
||||||
|
|
||||||
if (mimeType.startsWith("image/")) {
|
|
||||||
media.type = ParcelableMedia.Type.IMAGE
|
|
||||||
} else if (mimeType.startsWith("video/")) {
|
|
||||||
media.type = ParcelableMedia.Type.VIDEO
|
|
||||||
} else {
|
|
||||||
// https://github.com/TwidereProject/Twidere-Android/issues/729
|
|
||||||
// Skip unsupported attachment
|
|
||||||
return@mapNotNull null
|
|
||||||
}
|
|
||||||
media.width = attachment.width
|
|
||||||
media.height = attachment.height
|
|
||||||
media.url = if (TextUtils.isEmpty(externalUrl)) attachment.url else externalUrl
|
|
||||||
media.page_url = if (TextUtils.isEmpty(externalUrl)) attachment.url else externalUrl
|
|
||||||
media.media_url = attachment.url
|
|
||||||
media.preview_url = attachment.largeThumbUrl
|
|
||||||
return@mapNotNull null
|
|
||||||
}.toTypedArray()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun fromCard(card: CardEntity?, urlEntities: Array<UrlEntity>?,
|
private fun fromCard(card: CardEntity?, urlEntities: Array<UrlEntity>?,
|
||||||
|
@ -190,7 +170,7 @@ object ParcelableMediaUtils {
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
private fun CardEntity.StringValue.checkUrl(): Boolean {
|
private fun CardEntity.StringValue.checkUrl(): Boolean {
|
||||||
val value = this.value ?: return false
|
val value = this.value ?: return false
|
||||||
return value != null && (value.startsWith("http://") || value.startsWith("https://"))
|
return value.startsWith("http://") || value.startsWith("https://")
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getTypeInt(type: String): Int {
|
fun getTypeInt(type: String): Int {
|
||||||
|
|
Loading…
Reference in New Issue