Add support for gzipped and tgs files from network (#2454)

In addition to [#2435](#2435), added support for loading gziped and tgs files from the network, similar to zip files.
airbnb · Feb 27, 2024 · af7fffc · af7fffc
1 parent 5ad8744
commit af7fffc
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/lottie/src/main/java/com/airbnb/lottie/network/FileExtension.java b/lottie/src/main/java/com/airbnb/lottie/network/FileExtension.java
@@ -8,7 +8,8 @@
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public enum FileExtension {
   JSON(".json"),
-  ZIP(".zip");
+  ZIP(".zip"),
+  GZIP(".gz");
 
   public final String extension;
 

diff --git a/lottie/src/main/java/com/airbnb/lottie/network/NetworkCache.java b/lottie/src/main/java/com/airbnb/lottie/network/NetworkCache.java
@@ -76,6 +76,8 @@ Pair<FileExtension, InputStream> fetch(String url) {
     FileExtension extension;
     if (cachedFile.getAbsolutePath().endsWith(".zip")) {
       extension = FileExtension.ZIP;
+    } else if (cachedFile.getAbsolutePath().endsWith(".gz")) {
+      extension = FileExtension.GZIP;
     } else {
       extension = FileExtension.JSON;
     }
@@ -143,6 +145,10 @@ private File getCachedFile(String url) throws FileNotFoundException {
     if (zipFile.exists()) {
       return zipFile;
     }
+    File gzipFile = new File(parentDir(), filenameForUrl(url, FileExtension.GZIP, false));
+    if (gzipFile.exists()) {
+      return gzipFile;
+    }
     return null;
   }
 

diff --git a/lottie/src/main/java/com/airbnb/lottie/network/NetworkFetcher.java b/lottie/src/main/java/com/airbnb/lottie/network/NetworkFetcher.java
@@ -17,6 +17,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipInputStream;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
@@ -59,10 +60,19 @@ private LottieComposition fetchFromCache(Context context, @NonNull String url, @
     FileExtension extension = cacheResult.first;
     InputStream inputStream = cacheResult.second;
     LottieResult<LottieComposition> result;
-    if (extension == FileExtension.ZIP) {
-      result = LottieCompositionFactory.fromZipStreamSync(context, new ZipInputStream(inputStream), cacheKey);
-    } else {
-      result = LottieCompositionFactory.fromJsonInputStreamSync(inputStream, cacheKey);
+    switch (extension) {
+      case ZIP:
+        result = LottieCompositionFactory.fromZipStreamSync(context, new ZipInputStream(inputStream), cacheKey);
+        break;
+      case GZIP:
+        try {
+          result = LottieCompositionFactory.fromJsonInputStreamSync(new GZIPInputStream(inputStream), cacheKey);
+        } catch (IOException e) {
+          result = new LottieResult<>(e);
+        }
+        break;
+      default:
+        result = LottieCompositionFactory.fromJsonInputStreamSync(inputStream, cacheKey);
     }
     if (result.getValue() != null) {
       return result.getValue();
@@ -117,6 +127,12 @@ private LottieResult<LottieComposition> fromInputStream(Context context, @NonNul
       Logger.debug("Handling zip response.");
       extension = FileExtension.ZIP;
       result = fromZipStream(context, url, inputStream, cacheKey);
+    } else if (contentType.contains("application/gzip") ||
+        contentType.contains("application/x-gzip") ||
+        url.split("\\?")[0].endsWith(".tgs")) {
+      Logger.debug("Handling gzip response.");
+      extension = FileExtension.GZIP;
+      result = fromGzipStream(url, inputStream, cacheKey);
     } else {
       Logger.debug("Received json response.");
       extension = FileExtension.JSON;
@@ -140,6 +156,16 @@ private LottieResult<LottieComposition> fromZipStream(Context context, @NonNull
     return LottieCompositionFactory.fromZipStreamSync(context, new ZipInputStream(new FileInputStream(file)), url);
   }
 
+  @NonNull
+  private LottieResult<LottieComposition> fromGzipStream(@NonNull String url, @NonNull InputStream inputStream, @Nullable String cacheKey)
+      throws IOException {
+    if (cacheKey == null || networkCache == null) {
+      return LottieCompositionFactory.fromJsonInputStreamSync(new GZIPInputStream(inputStream), null);
+    }
+    File file = networkCache.writeTempCacheFile(url, inputStream, FileExtension.GZIP);
+    return LottieCompositionFactory.fromJsonInputStreamSync(new GZIPInputStream(new FileInputStream(file)), url);
+  }
+
   @NonNull
   private LottieResult<LottieComposition> fromJsonStream(@NonNull String url, @NonNull InputStream inputStream, @Nullable String cacheKey)
       throws IOException {