fixed #3

Author: divshekhar

android/.idea/vcs.xml

@@ -18,6 +18,7 @@ public class EventCallHandlerImplementation implements StreamHandler {
     private static EventSink mEventSink = null;
     @SuppressLint("StaticFieldLeak")
     private static Activity activity = null;
+    @SuppressLint("StaticFieldLeak")
     private static Context context = null;
 
     EventCallHandlerImplementation(Context context,Activity activity) {
@@ -46,7 +47,6 @@ public static void onProcessTextChanged() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             textIntent = activity.getIntent().getStringExtra(Intent.EXTRA_PROCESS_TEXT);
         } else {
-            textIntent = null;
             Log.e(TAG,"Compatibility Issue:");
             Log.i(TAG,"Make sure device android version >= M (Marshmallow)");
         }

android/src/main/java/com/divyanshushekhar/flutter_process_text/EventCallHandlerImplementation.java

@@ -52,13 +52,20 @@ public static String getPluginTag() {
 
 
   /* ------------- User Initialization -------------- */
-  private static boolean showToast = true;
+  private static boolean showConfirmationToast = true;
+  private static boolean showRefreshToast = true;
+  private static boolean showErrorToast = true;
   private static String confirmationMessage = null;
   private static String refreshMessage = null;
   private static String errorMessage = null;
 
-  public static void setUserInitialization(boolean showToast, String confirmationMessage, String refreshMessage, String errorMessage) {
-    FlutterProcessTextPlugin.showToast = showToast;
+  public static void setUserInitialization(boolean showConfirmationToast, boolean showRefreshToast,
+                                           boolean showErrorToast, String confirmationMessage,
+                                           String refreshMessage, String errorMessage) {
+
+    FlutterProcessTextPlugin.showConfirmationToast = showConfirmationToast;
+    FlutterProcessTextPlugin.showRefreshToast = showRefreshToast;
+    FlutterProcessTextPlugin.showErrorToast = showErrorToast;
     FlutterProcessTextPlugin.confirmationMessage = confirmationMessage;
     FlutterProcessTextPlugin.refreshMessage = refreshMessage;
     FlutterProcessTextPlugin.errorMessage = errorMessage;
@@ -67,19 +74,19 @@ public static void setUserInitialization(boolean showToast, String confirmationM
 
   /* ------------- Toast Messages -------------- */
   public static void showConfirmationToast() {
-    if(showToast) {
+    if(showConfirmationToast) {
       Toast.makeText(context, confirmationMessage, Toast.LENGTH_LONG).show();
     }
   }
 
   public static void showRefreshToast() {
-    if(showToast) {
+    if(showRefreshToast) {
       Toast.makeText(context, refreshMessage, Toast.LENGTH_LONG).show();
     }
   }
 
   public static void showErrorToast() {
-    if(showToast) {
+    if(showErrorToast) {
       Toast.makeText(context, errorMessage, Toast.LENGTH_LONG).show();
     }
   }
@@ -120,7 +127,7 @@ private void setupChannel(BinaryMessenger messenger, Context context, Activity a
     methodChannel = new MethodChannel(binaryMessenger, CHANNEL_ID);
     eventChannel = new EventChannel(binaryMessenger,STREAM_ID);
 
-    methodHandler = new MethodCallHandlerImplementation(context, activity);
+    methodHandler = new MethodCallHandlerImplementation();
     eventHandler = new EventCallHandlerImplementation(context, activity);
 
     methodChannel.setMethodCallHandler(methodHandler);
@@ -161,7 +168,6 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
   @Override
   public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
     activity = binding.getActivity();
-    methodHandler.setActivity(activity);
     EventCallHandlerImplementation.setActivity(activity);
   }
 
@@ -177,7 +183,6 @@ public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBindin
 
   @Override
   public void onDetachedFromActivity() {
-    methodHandler.setActivity(null);
     EventCallHandlerImplementation.setActivity(null);
   }
 

android/src/main/java/com/divyanshushekhar/flutter_process_text/FlutterProcessTextPlugin.java

@@ -15,25 +15,19 @@ public class MethodCallHandlerImplementation implements MethodChannel.MethodCall
 
     private static final String TAG = FlutterProcessTextPlugin.getPluginTag();
 
-    private final Context context;
-    private Activity activity;
-
-    MethodCallHandlerImplementation(Context context, Activity activity) {
-        this.context = context;
-        this.activity = activity;
-    }
-
-    void setActivity(Activity activity) {
-        this.activity = activity;
-    }
+    public MethodCallHandlerImplementation() {}
 
     @Override
     public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
         if (call.method.equals("initialize")) {
             Map<String, String> arguments = call.arguments();
             // Setting User Initialization coming from flutter side
-            FlutterProcessTextPlugin.setUserInitialization(Boolean.parseBoolean(arguments.get("showToast")),
-                    arguments.get("confirmationMessage"), arguments.get("refreshMessage"),
+            FlutterProcessTextPlugin.setUserInitialization(
+                    Boolean.parseBoolean(arguments.get("showConfirmationToast")),
+                    Boolean.parseBoolean(arguments.get("showRefreshToast")),
+                    Boolean.parseBoolean(arguments.get("showErrorToast")),
+                    arguments.get("confirmationMessage"),
+                    arguments.get("refreshMessage"),
                     arguments.get("errorMessage"));
         } else if (call.method.equals("getRefreshProcessText")) {
             try {

android/src/main/java/com/divyanshushekhar/flutter_process_text/MethodCallHandlerImplementation.java

@@ -12,26 +12,30 @@ class FlutterProcessText {
   static Stream<String>? _processTextStream;
 
   /// Initialize FlutterProcessText Plugins.
-  /// showToast<bool> - if true, will show a toast message, else not.
+  /// bool Confirmation, Refresh and Error Toast.
   /// set ConfirmationMessage to show a confirmation message in the Toast.
   /// set refreshMessage to show a refresh message in the Toast.
   /// set errorMessage to show a error message in the Toast.
   static Future<void> initialize({
-    bool showToast = true,
+    bool showConfirmationToast = true,
+    bool showRefreshToast = true,
+    bool showErrorToast = true,
     String confirmationMessage = "Text Fetched",
     String refreshMessage = "Refreshed",
     String errorMessage = "Unable to fetch text!",
   }) async {
     return await _channel.invokeMethod('initialize', {
-      'showToast': showToast.toString(),
+      'showConfirmationToast': showConfirmationToast.toString(),
+      'showRefreshToast': showRefreshToast.toString(),
+      'showErrorToast': showErrorToast.toString(),
       'confirmationMessage': confirmationMessage,
       'refreshMessage': refreshMessage,
       'errorMessage': errorMessage,
     });
   }
 
   /// Get the pending data by refreshing the process text
-  static Future<String> get refreshProcessText async {
+  static Future<String?> get refreshProcessText async {
     return await _channel.invokeMethod('getRefreshProcessText');
   }