aljaz/signal-cli
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli.git synced 2026-01-31 19:44:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add optional content type to json sticker pack manifest

Browse Source
This commit is contained in:
AsamK
2021-06-13 11:23:18 +02:00
parent 0b2d37fe68
commit f40c351662
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/src/main/java/org/asamk/signal/manager/JsonStickerPack.java
View File

@@ -25,5 +25,8 @@ public class JsonStickerPack {
@JsonProperty
public String file;
@JsonProperty
public String contentType;
}
}

23
lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
View File

@@ -8,10 +8,12 @@ import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifestUpload;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.zip.ZipFile;
@@ -54,7 +56,9 @@ public class StickerUtils {
throw new StickerPackInvalidException("Could not find find " + sticker.file);
}
var contentType = Utils.getFileMimeType(new File(sticker.file), null);
var contentType = sticker.contentType != null && !sticker.contentType.isEmpty()
? sticker.contentType
: getContentType(rootPath, zip, sticker.file);
var stickerInfo = new SignalServiceStickerManifestUpload.StickerInfo(data.first(),
data.second(),
Optional.fromNullable(sticker.emoji).or(""),
@@ -75,7 +79,9 @@ public class StickerUtils {
throw new StickerPackInvalidException("Could not find find " + pack.cover.file);
}
var contentType = Utils.getFileMimeType(new File(pack.cover.file), null);
var contentType = pack.cover.contentType != null && !pack.cover.contentType.isEmpty()
? pack.cover.contentType
: getContentType(rootPath, zip, pack.cover.file);
cover = new SignalServiceStickerManifestUpload.StickerInfo(data.first(),
data.second(),
Optional.fromNullable(pack.cover.emoji).or(""),
@@ -107,4 +113,17 @@ public class StickerUtils {
}
}
private static String getContentType(
final String rootPath, final ZipFile zip, final String subfile
) throws IOException {
if (zip != null) {
final var entry = zip.getEntry(subfile);
try (InputStream bufferedStream = new BufferedInputStream(zip.getInputStream(entry))) {
return URLConnection.guessContentTypeFromStream(bufferedStream);
}
} else {
final var file = new File(rootPath, subfile);
return Utils.getFileMimeType(file, null);
}
}
}