Changed Activity to Context

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
     project.evaluationDependsOn(':app')
 }
 }
 
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
     delete rootProject.buildDir
 }
 }

@@ -6,6 +6,7 @@
 - Implement PdfActionBarTheme for actions bar and add method scrollToPage [Aleksei]
 - Implement PdfActionBarTheme for actions bar and add method scrollToPage [Aleksei]
 - Update cursors in zoom mode for web [Aleksei]
 - Update cursors in zoom mode for web [Aleksei]
 - Output image sized to cropBox instead of mediaBox (iOS) [garrettApproachableGeek]
 - Output image sized to cropBox instead of mediaBox (iOS) [garrettApproachableGeek]
+- Replace Activity with Context for Service Compatibility (Android) [Heinrich]
 
 
 ## 5.11.1
 ## 5.11.1
 
 

 package net.nfet.flutter.printing;
 package net.nfet.flutter.printing;
 
 
-import android.app.Activity;
+import android.content.Context;
 import android.os.Build;
 import android.os.Build;
 import android.print.PrintAttributes;
 import android.print.PrintAttributes;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RequiresApi;
 
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 
 
@@ -14,11 +15,11 @@ import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel;
 
 
 public class PrintingHandler implements MethodChannel.MethodCallHandler {
 public class PrintingHandler implements MethodChannel.MethodCallHandler {
-    private final Activity activity;
+    private final Context context;
     private final MethodChannel channel;
     private final MethodChannel channel;
 
 
-    PrintingHandler(@NonNull Activity activity, @NonNull MethodChannel channel) {
-        this.activity = activity;
+    PrintingHandler(@NonNull Context context, @NonNull MethodChannel channel) {
+        this.context = context;
         this.channel = channel;
         this.channel = channel;
     }
     }
 
 
@@ -32,7 +33,7 @@ public class PrintingHandler implements MethodChannel.MethodCallHandler {
                     Double height = call.argument("height");
                     Double height = call.argument("height");
 
 
                     final PrintingJob printJob =
                     final PrintingJob printJob =
-                            new PrintingJob(activity, this, (int) call.argument("job"));
+                            new PrintingJob(context, this, (int) call.argument("job"));
                     assert name != null;
                     assert name != null;
                     printJob.printPdf(name, width, height);
                     printJob.printPdf(name, width, height);
 
 
@@ -41,7 +42,7 @@ public class PrintingHandler implements MethodChannel.MethodCallHandler {
                 }
                 }
                 case "cancelJob": {
                 case "cancelJob": {
                     final PrintingJob printJob =
                     final PrintingJob printJob =
-                            new PrintingJob(activity, this, (int) call.argument("job"));
+                            new PrintingJob(context, this, (int) call.argument("job"));
                     printJob.cancelJob(null);
                     printJob.cancelJob(null);
                     result.success(1);
                     result.success(1);
                     break;
                     break;
@@ -52,7 +53,7 @@ public class PrintingHandler implements MethodChannel.MethodCallHandler {
                     final String subject = call.argument("subject");
                     final String subject = call.argument("subject");
                     final String body = call.argument("body");
                     final String body = call.argument("body");
                     final ArrayList<String> emails = call.argument("emails");
                     final ArrayList<String> emails = call.argument("emails");
-                    PrintingJob.sharePdf(activity, document, name, subject, body, emails);
+                    PrintingJob.sharePdf(context, document, name, subject, body, emails);
                     result.success(1);
                     result.success(1);
                     break;
                     break;
                 }
                 }
@@ -64,7 +65,7 @@ public class PrintingHandler implements MethodChannel.MethodCallHandler {
                     Double marginRight = call.argument("marginRight");
                     Double marginRight = call.argument("marginRight");
                     Double marginBottom = call.argument("marginBottom");
                     Double marginBottom = call.argument("marginBottom");
                     final PrintingJob printJob =
                     final PrintingJob printJob =
-                            new PrintingJob(activity, this, (int) call.argument("job"));
+                            new PrintingJob(context, this, (int) call.argument("job"));
 
 
                     assert width != null;
                     assert width != null;
                     assert height != null;
                     assert height != null;
@@ -98,7 +99,7 @@ public class PrintingHandler implements MethodChannel.MethodCallHandler {
                     final ArrayList<Integer> pages = call.argument("pages");
                     final ArrayList<Integer> pages = call.argument("pages");
                     Double scale = call.argument("scale");
                     Double scale = call.argument("scale");
                     final PrintingJob printJob =
                     final PrintingJob printJob =
-                            new PrintingJob(activity, this, (int) call.argument("job"));
+                            new PrintingJob(context, this, (int) call.argument("job"));
                     printJob.rasterPdf(document, pages, scale);
                     printJob.rasterPdf(document, pages, scale);
                     result.success(1);
                     result.success(1);
                     break;
                     break;

@@ -16,10 +16,12 @@
 
 
 package net.nfet.flutter.printing;
 package net.nfet.flutter.printing;
 
 
-import android.app.Activity;
+import android.content.Context;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 
 
+import java.lang.ref.WeakReference;
+
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
@@ -30,20 +32,21 @@ import io.flutter.plugin.common.MethodChannel;
  * PrintingPlugin
  * PrintingPlugin
  */
  */
 public class PrintingPlugin implements FlutterPlugin, ActivityAware {
 public class PrintingPlugin implements FlutterPlugin, ActivityAware {
-    private Activity activity;
+    private Context context;
     private MethodChannel channel;
     private MethodChannel channel;
     private PrintingHandler handler;
     private PrintingHandler handler;
 
 
     @Override
     @Override
     public void onAttachedToEngine(FlutterPluginBinding binding) {
     public void onAttachedToEngine(FlutterPluginBinding binding) {
+        context = binding.getApplicationContext();
         onAttachedToEngine(binding.getBinaryMessenger());
         onAttachedToEngine(binding.getBinaryMessenger());
     }
     }
 
 
     private void onAttachedToEngine(BinaryMessenger messenger) {
     private void onAttachedToEngine(BinaryMessenger messenger) {
         channel = new MethodChannel(messenger, "net.nfet.printing");
         channel = new MethodChannel(messenger, "net.nfet.printing");
 
 
-        if (activity != null) {
-            handler = new PrintingHandler(activity, channel);
+        if (context != null) {
+            handler = new PrintingHandler(context, channel);
             channel.setMethodCallHandler(handler);
             channel.setMethodCallHandler(handler);
         }
         }
     }
     }
@@ -57,14 +60,16 @@ public class PrintingPlugin implements FlutterPlugin, ActivityAware {
 
 
     @Override
     @Override
     public void onAttachedToActivity(ActivityPluginBinding binding) {
     public void onAttachedToActivity(ActivityPluginBinding binding) {
-        onAttachedToActivity(binding.getActivity());
+        if (context != null) {
+            context = null;
+        }
+        context = binding.getActivity();
+        onAttachedToActivity(context);
     }
     }
 
 
-    private void onAttachedToActivity(Activity _activity) {
-        activity = _activity;
-
-        if (activity != null && channel != null) {
-            handler = new PrintingHandler(activity, channel);
+    private void onAttachedToActivity(Context context) {
+        if (context != null && channel != null) {
+            handler = new PrintingHandler(context, channel);
             channel.setMethodCallHandler(handler);
             channel.setMethodCallHandler(handler);
         }
         }
     }
     }
@@ -76,13 +81,15 @@ public class PrintingPlugin implements FlutterPlugin, ActivityAware {
 
 
     @Override
     @Override
     public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
     public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
-        onAttachedToActivity(binding.getActivity());
+        context = null;
+        context = binding.getActivity();
+        onAttachedToActivity(context);
     }
     }
 
 
     @Override
     @Override
     public void onDetachedFromActivity() {
     public void onDetachedFromActivity() {
         channel.setMethodCallHandler(null);
         channel.setMethodCallHandler(null);
-        activity = null;
+        context = null;
         handler = null;
         handler = null;
     }
     }
 }
 }