From d29daefc59a630ec77982783515fbfda21a2c57a Mon Sep 17 00:00:00 2001
From: Nan <nanftw@gmail.com>
Date: Sun, 10 Dec 2023 16:52:57 -0800
Subject: [PATCH 1/2] [nit] tabbing spaces

---
 .../com/onesignal/flutter/OneSignalUser.java  | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalUser.java b/android/src/main/java/com/onesignal/flutter/OneSignalUser.java
index 54d59a6d..4909a59a 100644
--- a/android/src/main/java/com/onesignal/flutter/OneSignalUser.java
+++ b/android/src/main/java/com/onesignal/flutter/OneSignalUser.java
@@ -54,10 +54,10 @@ else if (call.method.contentEquals("OneSignal#removeTags"))
 
     private void setLanguage(MethodCall call, Result result) {
         String language = call.argument("language");
-        if (language != null && language.length() == 0)
-          language = null;
-    
-          OneSignal.getUser().setLanguage(language);
+        if (language != null && language.length() == 0) {
+            language = null;
+        }
+        OneSignal.getUser().setLanguage(language);
     }
 
     private void addAliases(MethodCall call, Result result) {
@@ -83,23 +83,24 @@ private void removeAliases(MethodCall call, Result result) {
     private void addEmail(MethodCall call, Result result) {
         OneSignal.getUser().addEmail((String) call.arguments);
         replySuccess(result, null);
-      }
+    }
     
-      private void removeEmail(MethodCall call, Result result) {
+    private void removeEmail(MethodCall call, Result result) {
         OneSignal.getUser().removeEmail((String) call.arguments);
         replySuccess(result, null);
-      }
+    }
     
-      private void addSms(MethodCall call, Result result) {
+    private void addSms(MethodCall call, Result result) {
         OneSignal.getUser().addSms((String) call.arguments);
         replySuccess(result, null);
-      }
+    }
     
-      private void removeSms(MethodCall call, Result result) {
+    private void removeSms(MethodCall call, Result result) {
         OneSignal.getUser().removeSms((String) call.arguments);
         replySuccess(result, null);
-      }
-      private void addTags(MethodCall call, Result result) {
+    }
+
+    private void addTags(MethodCall call, Result result) {
         // call.arguments is being casted to a Map<String, Object> so a try-catch with
         //  a ClassCastException will be thrown
         try {
@@ -118,6 +119,4 @@ private void removeTags(MethodCall call, Result result) {
             replyError(result, "OneSignal", "deleteTags failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
         }
     }
-    
-     
 }

From c9c586e5b43232dbcb7b58288c3ffc9f049cb87c Mon Sep 17 00:00:00 2001
From: Nan <nanftw@gmail.com>
Date: Sun, 10 Dec 2023 16:56:24 -0800
Subject: [PATCH 2/2] Android User bridge methods should resolve

* A few methods were missing the `replySuccess` to resolve the call from the app developer.
---
 .../src/main/java/com/onesignal/flutter/OneSignalUser.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalUser.java b/android/src/main/java/com/onesignal/flutter/OneSignalUser.java
index 4909a59a..09d6f5e1 100644
--- a/android/src/main/java/com/onesignal/flutter/OneSignalUser.java
+++ b/android/src/main/java/com/onesignal/flutter/OneSignalUser.java
@@ -58,6 +58,7 @@ private void setLanguage(MethodCall call, Result result) {
             language = null;
         }
         OneSignal.getUser().setLanguage(language);
+        replySuccess(result, null);
     }
 
     private void addAliases(MethodCall call, Result result) {
@@ -65,6 +66,7 @@ private void addAliases(MethodCall call, Result result) {
         //  a ClassCastException will be thrown
         try {
             OneSignal.getUser().addAliases((Map<String, String>) call.arguments);
+            replySuccess(result, null);
         } catch(ClassCastException e) {
             replyError(result, "OneSignal", "addAliases failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
         }
@@ -75,6 +77,7 @@ private void removeAliases(MethodCall call, Result result) {
         //  a ClassCastException will be thrown
         try {
             OneSignal.getUser().removeAliases((List<String>) call.arguments);
+            replySuccess(result, null);
         } catch(ClassCastException e) {
             replyError(result, "OneSignal", "removeAliases failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
         }
@@ -105,6 +108,7 @@ private void addTags(MethodCall call, Result result) {
         //  a ClassCastException will be thrown
         try {
             OneSignal.getUser().addTags((Map<String, String>) call.arguments);
+            replySuccess(result, null);
         } catch(ClassCastException e) {
             replyError(result, "OneSignal", "addTags failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
         }
@@ -115,6 +119,7 @@ private void removeTags(MethodCall call, Result result) {
         //  a ClassCastException will be thrown
         try {
             OneSignal.getUser().removeTags((List<String>) call.arguments);
+            replySuccess(result, null);
         } catch(ClassCastException e) {
             replyError(result, "OneSignal", "deleteTags failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
         }