expo-h3 0.1.4 → 0.1.6

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.h3'
-version = '0.1.4'
+version = '0.1.6'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -35,7 +35,7 @@ android {
   namespace "expo.modules.h3"
   defaultConfig {
     versionCode 1
-    versionName "0.1.4"
+    versionName "0.1.6"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/h3/PrintHelper.java

@@ -15,58 +15,84 @@ import java.io.File;
 import java.io.IOException;
 
 public class PrintHelper {
-    public static void printWebView(PrintDocumentAdapter adapter, PrintAttributes attributes, File pdfFile, Context context, Promise promise) {
-        adapter.onLayout(null, attributes, null, new PrintDocumentAdapter.LayoutResultCallback() {
-            @Override
-            public void onLayoutFinished(PrintDocumentInfo info, boolean changed) {
-                ParcelFileDescriptor fd = null;
-                try {
-                    fd = ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_WRITE);
-                    adapter.onWrite(new PageRange[]{PageRange.ALL_PAGES}, fd, new CancellationSignal(), new PrintDocumentAdapter.WriteResultCallback() {
-                        @Override
-                        public void onWriteFinished(PageRange[] pages) {
-                            try {
-                                if (fd != null) {
-                                    fd.close();
-                                }
-                                // Now send the print intent
-                                Intent intent = new Intent();
-                                intent.setAction(Intent.ACTION_SEND);
-                                intent.setPackage("comb.bld.settings.print");
-                                intent.putExtra(Intent.EXTRA_TEXT, pdfFile.getAbsolutePath());
-                                intent.setType("application/pdf");
-                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                context.startActivity(intent);
-                                // Delete the temp file (assume print service has it now; add delay if needed for testing)
-                                pdfFile.delete();
-                                promise.resolve("Printed successfully");
-                            } catch (Exception e) {
-                                promise.reject("PRINT_ERROR", e.getMessage(), e);
-                            }
-                        }
-
-                        @Override
-                        public void onWriteFailed(CharSequence error) {
-                            promise.reject("PDF_WRITE_ERROR", error != null ? error.toString() : "Unknown error", null);
-                        }
-                    });
-                } catch (IOException e) {
-                    promise.reject("FILE_ERROR", e.getMessage(), e);
-                } finally {
-                    if (fd != null) {
-                        try {
-                            fd.close();
-                        } catch (IOException e) {
-                            // Ignore
-                        }
-                    }
-                }
+
+    public static void printWebView(PrintDocumentAdapter adapter, PrintAttributes attributes,
+                                    File pdfFile, Context context, Promise promise) {
+
+        adapter.onLayout(null, attributes, null, new MyLayoutCallback(pdfFile, context, promise, adapter), null);
+    }
+
+    private static final class MyLayoutCallback extends PrintDocumentAdapter.LayoutResultCallback {
+
+        private final File pdfFile;
+        private final Context context;
+        private final Promise promise;
+        private final PrintDocumentAdapter adapter;
+
+        MyLayoutCallback(File pdfFile, Context context, Promise promise, PrintDocumentAdapter adapter) {
+            this.pdfFile = pdfFile;
+            this.context = context;
+            this.promise = promise;
+            this.adapter = adapter;
+        }
+
+        @Override
+        public void onLayoutFinished(PrintDocumentInfo info, boolean changed) {
+            ParcelFileDescriptor fd = null;
+            try {
+                fd = ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_WRITE);
+
+                adapter.onWrite(new PageRange[]{PageRange.ALL_PAGES}, fd, new CancellationSignal(),
+                        new MyWriteCallback(fd, pdfFile, context, promise));
+
+            } catch (IOException e) {
+                promise.reject("FILE_ERROR", e.getMessage(), e);
             }
+        }
 
-            @Override
-            public void onLayoutFailed(CharSequence error) {
-                promise.reject("PDF_LAYOUT_ERROR", error != null ? error.toString() : "Unknown error", null);
+        @Override
+        public void onLayoutFailed(CharSequence error) {
+            promise.reject("PDF_LAYOUT_ERROR", error != null ? error.toString() : "Layout failed", null);
+        }
+    }
+
+    private static final class MyWriteCallback extends PrintDocumentAdapter.WriteResultCallback {
+
+        private final ParcelFileDescriptor fd;
+        private final File pdfFile;
+        private final Context context;
+        private final Promise promise;
+
+        MyWriteCallback(ParcelFileDescriptor fd, File pdfFile, Context context, Promise promise) {
+            this.fd = fd;
+            this.pdfFile = pdfFile;
+            this.context = context;
+            this.promise = promise;
+        }
+
+        @Override
+        public void onWriteFinished(PageRange[] pages) {
+            try {
+                if (fd != null) fd.close();
+
+                Intent intent = new Intent(Intent.ACTION_SEND);
+                intent.setPackage("comb.bld.settings.print");
+                intent.putExtra(Intent.EXTRA_TEXT, pdfFile.getAbsolutePath());
+                intent.setType("application/pdf");
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+                context.startActivity(intent);
+                pdfFile.delete();
+
+                promise.resolve("Printed successfully");
+            } catch (Exception e) {
+                promise.reject("PRINT_ERROR", e.getMessage(), e);
             }
-        }, null);
+        }
+
+        @Override
+        public void onWriteFailed(CharSequence error) {
+            promise.reject("PDF_WRITE_ERROR", error != null ? error.toString() : "Write failed", null);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-h3",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "My new module",
   "main": "build/index.js",
   "types": "build/index.d.ts",