Add close param to LottieCompositionFactory.fromJsonReader (#2342)

airbnb · Jul 25, 2023 · 78dd109 · 78dd109
1 parent 6c26b9f
commit 78dd109
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java b/lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java
@@ -333,22 +333,14 @@ public static LottieResult<LottieComposition> fromJsonInputStreamSync(InputStrea
     return fromJsonInputStreamSync(stream, cacheKey, true);
   }
 
-
   /**
    * Return a LottieComposition for the given InputStream to json.
    */
   @WorkerThread
   public static LottieResult<LottieComposition> fromJsonInputStreamSync(InputStream stream, @Nullable String cacheKey, boolean close) {
-    try {
-      return fromJsonReaderSync(JsonReader.of(buffer(source(stream))), cacheKey);
-    } finally {
-      if (close) {
-        closeQuietly(stream);
-      }
-    }
+    return fromJsonReaderSync(JsonReader.of(buffer(source(stream))), cacheKey, close);
   }
 
-
   /**
    * @see #fromJsonSync(JSONObject, String)
    */
@@ -394,12 +386,15 @@ public static LottieTask<LottieComposition> fromJsonReader(final JsonReader read
     return cache(cacheKey, () -> fromJsonReaderSync(reader, cacheKey), () -> Utils.closeQuietly(reader));
   }
 
-
   @WorkerThread
   public static LottieResult<LottieComposition> fromJsonReaderSync(com.airbnb.lottie.parser.moshi.JsonReader reader, @Nullable String cacheKey) {
-    return fromJsonReaderSyncInternal(reader, cacheKey, true);
+    return fromJsonReaderSync(reader, cacheKey, true);
   }
 
+  @WorkerThread
+  public static LottieResult<LottieComposition> fromJsonReaderSync(com.airbnb.lottie.parser.moshi.JsonReader reader, @Nullable String cacheKey, boolean close) {
+    return fromJsonReaderSyncInternal(reader, cacheKey, close);
+  }
 
   private static LottieResult<LottieComposition> fromJsonReaderSyncInternal(
       com.airbnb.lottie.parser.moshi.JsonReader reader, @Nullable String cacheKey, boolean close) {