@papyrus-sdk/engine-native 0.2.10 → 0.2.11

package/android/src/main/java/android/support/v4/util/ArrayMap.java

@@ -1,18 +1,18 @@
-package android.support.v4.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ArrayMap<K, V> extends HashMap<K, V> {
-  public ArrayMap() {
-    super();
-  }
-
-  public ArrayMap(int capacity) {
-    super(capacity);
-  }
-
-  public ArrayMap(Map<? extends K, ? extends V> map) {
-    super(map);
-  }
-}
+package android.support.v4.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ArrayMap<K, V> extends HashMap<K, V> {
+  public ArrayMap() {
+    super();
+  }
+
+  public ArrayMap(int capacity) {
+    super(capacity);
+  }
+
+  public ArrayMap(Map<? extends K, ? extends V> map) {
+    super(map);
+  }
+}

package/android/src/main/java/com/papyrus/engine/PapyrusNativeEngineModule.java

@@ -451,25 +451,25 @@ public class PapyrusNativeEngineModule extends ReactContextBaseJavaModule {
         return copyFromContentUri(Uri.parse(uriString), context);
       }
 
-      if (uriString.startsWith("file://")) {
-        return new File(Uri.parse(uriString).getPath());
-      }
-
-      if (uriString.startsWith("res://")) {
-        String resourceName = uriString.substring("res://".length());
-        File resourceFile = copyFromRawResource(resourceName, context);
-        if (resourceFile != null) {
-          return resourceFile;
-        }
-      }
-
-      File resourceFile = copyFromRawResource(uriString, context);
-      if (resourceFile != null) {
-        return resourceFile;
-      }
-
-      return new File(uriString);
-    }
+      if (uriString.startsWith("file://")) {
+        return new File(Uri.parse(uriString).getPath());
+      }
+
+      if (uriString.startsWith("res://")) {
+        String resourceName = uriString.substring("res://".length());
+        File resourceFile = copyFromRawResource(resourceName, context);
+        if (resourceFile != null) {
+          return resourceFile;
+        }
+      }
+
+      File resourceFile = copyFromRawResource(uriString, context);
+      if (resourceFile != null) {
+        return resourceFile;
+      }
+
+      return new File(uriString);
+    }
 
     if (source.hasKey("data") && source.getType("data") == ReadableType.Array) {
       ReadableArray array = source.getArray("data");
@@ -507,24 +507,24 @@ public class PapyrusNativeEngineModule extends ReactContextBaseJavaModule {
     return out;
   }
 
-  private static File copyFromAsset(String assetPath, Context context) throws IOException {
-    InputStream inputStream = context.getAssets().open(assetPath);
-    File out = createTempFile(context);
-    writeStreamToFile(inputStream, out);
-    return out;
-  }
-
-  private static File copyFromRawResource(String resourceName, Context context) throws IOException {
-    int resId = context.getResources().getIdentifier(resourceName, "raw", context.getPackageName());
-    if (resId == 0) {
-      return null;
-    }
-    InputStream inputStream = context.getResources().openRawResource(resId);
-    File out = createTempFile(context);
-    writeStreamToFile(inputStream, out);
-    return out;
-  }
-
+  private static File copyFromAsset(String assetPath, Context context) throws IOException {
+    InputStream inputStream = context.getAssets().open(assetPath);
+    File out = createTempFile(context);
+    writeStreamToFile(inputStream, out);
+    return out;
+  }
+
+  private static File copyFromRawResource(String resourceName, Context context) throws IOException {
+    int resId = context.getResources().getIdentifier(resourceName, "raw", context.getPackageName());
+    if (resId == 0) {
+      return null;
+    }
+    InputStream inputStream = context.getResources().openRawResource(resId);
+    File out = createTempFile(context);
+    writeStreamToFile(inputStream, out);
+    return out;
+  }
+
   private static File writeBytesToCache(byte[] bytes, Context context) throws IOException {
     File out = createTempFile(context);
     FileOutputStream fos = new FileOutputStream(out);

package/android/src/main/java/com/papyrus/engine/PapyrusNativeEngineModule.kt

@@ -437,25 +437,25 @@ class PapyrusNativeEngineModule : Module() {
         return copyFromContentUri(Uri.parse(uriValue), context)
       }
 
-      if (uriValue.startsWith("file://")) {
-        return File(Uri.parse(uriValue).path ?: return null)
-      }
-
-      if (uriValue.startsWith("res://")) {
-        val resourceName = uriValue.substring("res://".length)
-        val resourceId = context.resources.getIdentifier(resourceName, "raw", context.packageName)
-        if (resourceId != 0) {
-          return copyFromRawResource(resourceId, context)
-        }
-      }
-
-      val resourceId = context.resources.getIdentifier(uriValue, "raw", context.packageName)
-      if (resourceId != 0) {
-        return copyFromRawResource(resourceId, context)
-      }
-
-      return File(uriValue)
-    }
+      if (uriValue.startsWith("file://")) {
+        return File(Uri.parse(uriValue).path ?: return null)
+      }
+
+      if (uriValue.startsWith("res://")) {
+        val resourceName = uriValue.substring("res://".length)
+        val resourceId = context.resources.getIdentifier(resourceName, "raw", context.packageName)
+        if (resourceId != 0) {
+          return copyFromRawResource(resourceId, context)
+        }
+      }
+
+      val resourceId = context.resources.getIdentifier(uriValue, "raw", context.packageName)
+      if (resourceId != 0) {
+        return copyFromRawResource(resourceId, context)
+      }
+
+      return File(uriValue)
+    }
 
     val dataValue = source["data"]
     if (dataValue != null) {
@@ -513,21 +513,21 @@ class PapyrusNativeEngineModule : Module() {
   }
 
   @Throws(IOException::class)
-  private fun copyFromAsset(assetPath: String, context: Context): File {
-    val inputStream = context.assets.open(assetPath)
-    val out = createTempFile(context)
-    writeStreamToFile(inputStream, out)
-    return out
-  }
-
-  @Throws(IOException::class)
-  private fun copyFromRawResource(resourceId: Int, context: Context): File {
-    val inputStream = context.resources.openRawResource(resourceId)
-    val out = createTempFile(context)
-    writeStreamToFile(inputStream, out)
-    return out
-  }
-
+  private fun copyFromAsset(assetPath: String, context: Context): File {
+    val inputStream = context.assets.open(assetPath)
+    val out = createTempFile(context)
+    writeStreamToFile(inputStream, out)
+    return out
+  }
+
+  @Throws(IOException::class)
+  private fun copyFromRawResource(resourceId: Int, context: Context): File {
+    val inputStream = context.resources.openRawResource(resourceId)
+    val out = createTempFile(context)
+    writeStreamToFile(inputStream, out)
+    return out
+  }
+
   @Throws(IOException::class)
   private fun writeBytesToCache(bytes: ByteArray, context: Context): File {
     val out = createTempFile(context)

package/android/src/main/java/com/papyrus/engine/PapyrusOutline.java

@@ -1,34 +1,34 @@
-package com.papyrus.engine;
-
-final class PapyrusOutline {
-  interface LibraryLoader {
-    void load() throws Throwable;
-  }
-
-  interface OutlineSupportProbe {
-    boolean isSupported() throws Throwable;
-  }
-
-  static final boolean AVAILABLE;
-
-  static {
-    AVAILABLE = computeAvailability(
-        () -> System.loadLibrary("papyrus_text"),
-        PapyrusOutline::nativeIsOutlineSupported);
-  }
-
-  static boolean computeAvailability(LibraryLoader loader, OutlineSupportProbe probe) {
-    try {
-      loader.load();
-      return probe.isSupported();
-    } catch (Throwable ignored) {
-      return false;
-    }
-  }
-
-  static native boolean nativeIsOutlineSupported();
-
-  static native PapyrusOutlineItem[] nativeGetOutline(long docPtr);
-
-  static native PapyrusOutlineItem[] nativeGetOutlineFile(String filePath);
+package com.papyrus.engine;
+
+final class PapyrusOutline {
+  interface LibraryLoader {
+    void load() throws Throwable;
+  }
+
+  interface OutlineSupportProbe {
+    boolean isSupported() throws Throwable;
+  }
+
+  static final boolean AVAILABLE;
+
+  static {
+    AVAILABLE = computeAvailability(
+        () -> System.loadLibrary("papyrus_text"),
+        PapyrusOutline::nativeIsOutlineSupported);
+  }
+
+  static boolean computeAvailability(LibraryLoader loader, OutlineSupportProbe probe) {
+    try {
+      loader.load();
+      return probe.isSupported();
+    } catch (Throwable ignored) {
+      return false;
+    }
+  }
+
+  static native boolean nativeIsOutlineSupported();
+
+  static native PapyrusOutlineItem[] nativeGetOutline(long docPtr);
+
+  static native PapyrusOutlineItem[] nativeGetOutlineFile(String filePath);
 }

package/android/src/main/java/com/papyrus/engine/PapyrusPageView.java

@@ -6,6 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 
 import com.shockwave.pdfium.PdfDocument;
@@ -14,6 +15,9 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public class PapyrusPageView extends View {
+  static final long MAX_RENDER_PIXELS = 8L * 1024L * 1024L;
+  static final int MAX_RENDER_EDGE = 4096;
+  private static final String TAG = "PapyrusPageView";
   private static final ExecutorService RENDER_EXECUTOR = Executors.newSingleThreadExecutor();
 
   private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -43,8 +47,12 @@ public class PapyrusPageView extends View {
     final int viewHeight = getHeight();
     final float clampedZoom = Math.max(0.1f, Math.min(5.0f, zoom));
     final float targetScale = Math.max(0.1f, scale) * clampedZoom;
-    final int renderWidth = Math.max(1, (int) (viewWidth * targetScale));
-    final int renderHeight = Math.max(1, (int) (viewHeight * targetScale));
+    final int[] renderSize = constrainRenderSize(
+      Math.max(1, (int) (viewWidth * targetScale)),
+      Math.max(1, (int) (viewHeight * targetScale))
+    );
+    final int renderWidth = renderSize[0];
+    final int renderHeight = renderSize[1];
 
     RENDER_EXECUTOR.execute(() -> {
       PdfDocument doc = state.document;
@@ -81,6 +89,40 @@ public class PapyrusPageView extends View {
     super.onDraw(canvas);
     if (bitmap == null) return;
     Rect dest = new Rect(0, 0, getWidth(), getHeight());
-    canvas.drawBitmap(bitmap, null, dest, paint);
+    try {
+      canvas.drawBitmap(bitmap, null, dest, paint);
+    } catch (RuntimeException error) {
+      Log.w(TAG, "Failed to draw rendered page bitmap safely", error);
+      if (bitmap != null && !bitmap.isRecycled()) {
+        bitmap.recycle();
+      }
+      bitmap = null;
+    }
+  }
+
+  static int[] constrainRenderSize(int requestedWidth, int requestedHeight) {
+    int width = Math.max(1, requestedWidth);
+    int height = Math.max(1, requestedHeight);
+    double scale = 1.0d;
+
+    if (width > MAX_RENDER_EDGE || height > MAX_RENDER_EDGE) {
+      scale = Math.min(
+        scale,
+        Math.min((double) MAX_RENDER_EDGE / width, (double) MAX_RENDER_EDGE / height)
+      );
+    }
+
+    long pixels = (long) width * (long) height;
+    if (pixels > MAX_RENDER_PIXELS) {
+      scale = Math.min(scale, Math.sqrt((double) MAX_RENDER_PIXELS / (double) pixels));
+    }
+
+    if (scale >= 1.0d) {
+      return new int[] { width, height };
+    }
+
+    int safeWidth = Math.max(1, (int) Math.floor(width * scale));
+    int safeHeight = Math.max(1, (int) Math.floor(height * scale));
+    return new int[] { safeWidth, safeHeight };
   }
 }

package/android/src/test/java/com/papyrus/engine/PapyrusOutlineTest.java

@@ -1,40 +1,40 @@
-package com.papyrus.engine;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class PapyrusOutlineTest {
-  @Test
-  public void computeAvailabilityReturnsTrueWhenLoaderAndProbeSucceed() {
-    boolean available = PapyrusOutline.computeAvailability(() -> {}, () -> true);
-
-    assertTrue(available);
-  }
-
-  @Test
-  public void computeAvailabilityReturnsFalseWhenProbeReturnsFalse() {
-    boolean available = PapyrusOutline.computeAvailability(() -> {}, () -> false);
-
-    assertFalse(available);
-  }
-
-  @Test
-  public void computeAvailabilityReturnsFalseWhenProbeThrows() {
-    boolean available = PapyrusOutline.computeAvailability(() -> {}, () -> {
-      throw new UnsatisfiedLinkError("missing probe");
-    });
-
-    assertFalse(available);
-  }
-
-  @Test
-  public void computeAvailabilityReturnsFalseWhenLibraryLoadThrows() {
-    boolean available = PapyrusOutline.computeAvailability(() -> {
-      throw new UnsatisfiedLinkError("missing lib");
-    }, () -> true);
-
-    assertFalse(available);
-  }
+package com.papyrus.engine;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class PapyrusOutlineTest {
+  @Test
+  public void computeAvailabilityReturnsTrueWhenLoaderAndProbeSucceed() {
+    boolean available = PapyrusOutline.computeAvailability(() -> {}, () -> true);
+
+    assertTrue(available);
+  }
+
+  @Test
+  public void computeAvailabilityReturnsFalseWhenProbeReturnsFalse() {
+    boolean available = PapyrusOutline.computeAvailability(() -> {}, () -> false);
+
+    assertFalse(available);
+  }
+
+  @Test
+  public void computeAvailabilityReturnsFalseWhenProbeThrows() {
+    boolean available = PapyrusOutline.computeAvailability(() -> {}, () -> {
+      throw new UnsatisfiedLinkError("missing probe");
+    });
+
+    assertFalse(available);
+  }
+
+  @Test
+  public void computeAvailabilityReturnsFalseWhenLibraryLoadThrows() {
+    boolean available = PapyrusOutline.computeAvailability(() -> {
+      throw new UnsatisfiedLinkError("missing lib");
+    }, () -> true);
+
+    assertFalse(available);
+  }
 }

package/android/src/test/java/com/papyrus/engine/PapyrusPageViewTest.java

@@ -0,0 +1,30 @@
+package com.papyrus.engine;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class PapyrusPageViewTest {
+  @Test
+  public void constrainRenderSizeKeepsSafeSizesUntouched() {
+    int[] size = PapyrusPageView.constrainRenderSize(1200, 1600);
+
+    assertArrayEquals(new int[] {1200, 1600}, size);
+  }
+
+  @Test
+  public void constrainRenderSizeCapsOversizedBitmapsPreservingAspectRatio() {
+    int[] size = PapyrusPageView.constrainRenderSize(6000, 8000);
+
+    assertTrue(size[0] > 0);
+    assertTrue(size[1] > 0);
+    assertTrue(size[0] <= PapyrusPageView.MAX_RENDER_EDGE);
+    assertTrue(size[1] <= PapyrusPageView.MAX_RENDER_EDGE);
+    assertTrue(
+      ((long) size[0] * (long) size[1]) <= PapyrusPageView.MAX_RENDER_PIXELS
+    );
+    assertTrue(size[0] < 6000);
+    assertTrue(size[1] < 8000);
+  }
+}