added initial media description support
This commit is contained in:
parent
cb27dcace2
commit
1294539a62
|
@ -27,6 +27,7 @@ public class MediaStatus implements Serializable, Closeable {
|
|||
|
||||
private String mimeType;
|
||||
private String path;
|
||||
private String description;
|
||||
private boolean local;
|
||||
|
||||
/**
|
||||
|
@ -38,18 +39,21 @@ public class MediaStatus implements Serializable, Closeable {
|
|||
public MediaStatus(@Nullable InputStream inputStream, String mimeType) {
|
||||
this.inputStream = inputStream;
|
||||
this.mimeType = mimeType;
|
||||
description = "";
|
||||
local = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* create MediaStatus from an offline source
|
||||
*
|
||||
* @param path path to the local file
|
||||
* @param mimeType MIME type of the file
|
||||
* @param path path to the local file
|
||||
* @param mimeType MIME type of the file
|
||||
* @param description description of the media source
|
||||
*/
|
||||
public MediaStatus(String path, String mimeType) {
|
||||
public MediaStatus(String path, String mimeType, String description) {
|
||||
this.path = path;
|
||||
this.mimeType = mimeType;
|
||||
this.description = description;
|
||||
local = true;
|
||||
}
|
||||
|
||||
|
@ -108,9 +112,8 @@ public class MediaStatus implements Serializable, Closeable {
|
|||
/**
|
||||
* @return media description if any
|
||||
*/
|
||||
@SuppressWarnings("SameReturnValue")
|
||||
public String getDescription() {
|
||||
return ""; // todo implement this
|
||||
return description;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -115,7 +115,7 @@ public class MessageUpdate implements Serializable, Closeable {
|
|||
return false;
|
||||
}
|
||||
this.mediaUri = uri.toString();
|
||||
mediaUpdate = new MediaStatus(uri.toString(), mime);
|
||||
mediaUpdate = new MediaStatus(uri.toString(), mime, "");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -174,7 +174,7 @@ public class StatusUpdate implements Serializable, Closeable {
|
|||
DocumentFile file = DocumentFile.fromSingleUri(context, mediaUri);
|
||||
if (file != null && file.length() > 0) {
|
||||
previews.add(mediaUri.toString());
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime));
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime, ""));
|
||||
if (mediaStatuses.size() + mediaKeys.size() == instance.getGifLimit()) {
|
||||
attachmentLimitReached = true;
|
||||
}
|
||||
|
@ -194,7 +194,7 @@ public class StatusUpdate implements Serializable, Closeable {
|
|||
DocumentFile file = DocumentFile.fromSingleUri(context, mediaUri);
|
||||
if (file != null && file.length() > 0) {
|
||||
previews.add(mediaUri.toString());
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime));
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime, ""));
|
||||
if (mediaStatuses.size() + mediaKeys.size() == instance.getImageLimit()) {
|
||||
attachmentLimitReached = true;
|
||||
}
|
||||
|
@ -213,7 +213,7 @@ public class StatusUpdate implements Serializable, Closeable {
|
|||
DocumentFile file = DocumentFile.fromSingleUri(context, mediaUri);
|
||||
if (file != null && file.length() > 0) {
|
||||
previews.add(mediaUri.toString());
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime));
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime, ""));
|
||||
if (mediaStatuses.size() + mediaKeys.size() == instance.getVideoLimit()) {
|
||||
attachmentLimitReached = true;
|
||||
}
|
||||
|
@ -232,7 +232,7 @@ public class StatusUpdate implements Serializable, Closeable {
|
|||
DocumentFile file = DocumentFile.fromSingleUri(context, mediaUri);
|
||||
if (file != null && file.length() > 0) {
|
||||
previews.add(mediaUri.toString());
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime));
|
||||
mediaStatuses.add(new MediaStatus(mediaUri.toString(), mime, ""));
|
||||
if (mediaStatuses.size() + mediaKeys.size() == instance.getAudioLimit()) {
|
||||
attachmentLimitReached = true;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue