Fixes for android && IOS (#1)

* Fix : Unable to PrintToPrinter in IOS15 katzer#281 See katzer#281 (comment) * Fix : pick method returns null in IOS15 katzer#268 See katzer#268 * Fix : Unable to PrintToPrinter in AndroidX --------- Co-authored-by: IACHI Dimitri Fabien <[email protected]>
KK998 · Mar 13, 2023 · 62689fc · 62689fc
1 parent 672d804
commit 62689fc
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 22 deletions.
diff --git a/src/android/PrintAdapter.java b/src/android/PrintAdapter.java
@@ -28,8 +28,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
 import android.print.PrintDocumentInfo;
-import android.support.annotation.NonNull;
-import android.support.v4.print.PrintHelper;
+import androidx.annotation.NonNull;
+import androidx.print.PrintHelper;
 
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/src/android/PrintContent.java b/src/android/PrintContent.java
@@ -24,8 +24,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

diff --git a/src/android/PrintIO.java b/src/android/PrintIO.java
@@ -26,8 +26,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Base64;
 
 import java.io.ByteArrayInputStream;

diff --git a/src/android/PrintManager.java b/src/android/PrintManager.java
@@ -27,9 +27,9 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
 import android.print.PrintJob;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.print.PrintHelper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.print.PrintHelper;
 import android.webkit.CookieManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;

diff --git a/src/android/PrintOptions.java b/src/android/PrintOptions.java
@@ -22,8 +22,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 package de.appplant.cordova.plugin.printer;
 
 import android.print.PrintAttributes;
-import android.support.annotation.NonNull;
-import android.support.v4.print.PrintHelper;
+import androidx.annotation.NonNull;
+import androidx.print.PrintHelper;
 
 import org.json.JSONObject;
 
@@ -35,10 +35,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 import static android.print.PrintAttributes.MediaSize.UNKNOWN_LANDSCAPE;
 import static android.print.PrintAttributes.MediaSize.UNKNOWN_PORTRAIT;
 import static android.print.PrintDocumentInfo.PAGE_COUNT_UNKNOWN;
-import static android.support.v4.print.PrintHelper.ORIENTATION_LANDSCAPE;
-import static android.support.v4.print.PrintHelper.ORIENTATION_PORTRAIT;
-import static android.support.v4.print.PrintHelper.SCALE_MODE_FILL;
-import static android.support.v4.print.PrintHelper.SCALE_MODE_FIT;
+import static androidx.print.PrintHelper.ORIENTATION_LANDSCAPE;
+import static androidx.print.PrintHelper.ORIENTATION_PORTRAIT;
+import static androidx.print.PrintHelper.SCALE_MODE_FILL;
+import static androidx.print.PrintHelper.SCALE_MODE_FIT;
 
 /**
  * Wrapper for the print job settings.

diff --git a/src/android/PrintProxy.java b/src/android/PrintProxy.java
@@ -27,8 +27,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.print.PageRange;
 import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
-import android.support.annotation.NonNull;
-import android.support.v4.print.PrintHelper;
+import androidx.annotation.NonNull;
+import androidx.print.PrintHelper;
 
 /**
  * Simple delegate class to have access to the onFinish method.

diff --git a/src/android/Printer.java b/src/android/Printer.java
@@ -21,8 +21,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package de.appplant.cordova.plugin.printer;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.webkit.WebView;
 
 import org.apache.cordova.CallbackContext;

diff --git a/src/ios/APPPrinter.m b/src/ios/APPPrinter.m
@@ -173,9 +173,12 @@ - (void) printContent:(NSString *)content
          withSettings:(NSDictionary *)settings
 {
     __block id item;
+    __block UIPrintInteractionController* ctrl;
 
-    UIPrintInteractionController* ctrl =
-    [UIPrintInteractionController sharedPrintControllerWithSettings:settings];
+    dispatch_sync(dispatch_get_main_queue(), ^{
+        ctrl =
+        [UIPrintInteractionController sharedPrintControllerWithSettings:settings];
+    });
 
     ctrl.delegate = self;
 

diff --git a/www/printer.js b/www/printer.js
@@ -21,7 +21,7 @@
 
 var exec  = require('cordova/exec'),
     ua    = navigator.userAgent.toLowerCase(),
-    isIOS = ua.indexOf('ipad') > -1 || ua.indexOf('iphone') > -1;
+    isIOS = ua.indexOf('ipad') > -1 || ua.indexOf('iphone') > -1 || window.cordova.platformId === "ios";
 
 // Defaults
 exports._defaults = {