Merge pull request #662 from OneSignal/user_model/testing-cleanup

[User Model] Testing + Cleanup

Author: fhboswell

android/build.gradle

@@ -34,5 +34,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.onesignal:OneSignal:5.0.0-beta1'
+    implementation 'com.onesignal:OneSignal:5.0.0-beta2'
 }

android/src/main/java/com/onesignal/flutter/OneSignalDebug.java

@@ -19,9 +19,8 @@
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class OneSignalDebug extends FlutterRegistrarResponder implements MethodCallHandler {
-    private MethodChannel channel;
-
-    static void registerWith(BinaryMessenger messenger) {
+    
+   static void registerWith(BinaryMessenger messenger) {
         OneSignalDebug controller = new OneSignalDebug();
         controller.messenger = messenger;
         controller.channel = new MethodChannel(messenger, "OneSignal#debug");

android/src/main/java/com/onesignal/flutter/OneSignalInAppMessages.java

@@ -17,15 +17,14 @@
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class OneSignalInAppMessages extends FlutterRegistrarResponder implements MethodCallHandler, 
-IInAppMessageClickHandler{
-    private MethodChannel channel;
-
+IInAppMessageClickHandler, IInAppMessageLifecycleHandler{
+  
     private IInAppMessageClickResult inAppMessageClickedResult;
     private boolean hasSetInAppMessageClickedHandler = false;
 
     static void registerWith(BinaryMessenger messenger) {
         OneSignalInAppMessages sharedInstance = new OneSignalInAppMessages();
-       
+
         sharedInstance.messenger = messenger;
         sharedInstance.channel = new MethodChannel(messenger, "OneSignal#inappmessages");
         sharedInstance.channel.setMethodCallHandler(sharedInstance);   
@@ -109,26 +108,26 @@ public void inAppMessageClicked(IInAppMessageClickResult action) {
 
     /* in app message lifecycle */
     public void setInAppMessageLifecycleHandler() {
-        OneSignal.getInAppMessages().setInAppMessageLifecycleHandler(new IInAppMessageLifecycleHandler() {
-            @Override
-            public void onWillDisplayInAppMessage(IInAppMessage message) { 
-                invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
-            }
-
-            @Override
-            public void onDidDisplayInAppMessage(IInAppMessage message) {
-                invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
-            }
-
-            @Override
-            public void onWillDismissInAppMessage(IInAppMessage message) {
-                invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
-            }
-
-            @Override
-            public void onDidDismissInAppMessage(IInAppMessage message) {
-                invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
-            }
-        });
-  }
+        OneSignal.getInAppMessages().setInAppMessageLifecycleHandler(this);
+    }
+    
+    @Override
+    public void onWillDisplayInAppMessage(IInAppMessage message) { 
+        invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+    }
+
+    @Override
+    public void onDidDisplayInAppMessage(IInAppMessage message) {
+        invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+    }
+
+    @Override
+    public void onWillDismissInAppMessage(IInAppMessage message) {
+        invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+    }
+
+    @Override
+    public void onDidDismissInAppMessage(IInAppMessage message) {
+        invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+    }
 }

android/src/main/java/com/onesignal/flutter/OneSignalLocation.java

@@ -19,7 +19,6 @@
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class OneSignalLocation extends FlutterRegistrarResponder implements MethodCallHandler {
-    private MethodChannel channel;
 
     static void registerWith(BinaryMessenger messenger) {
         OneSignalLocation controller = new OneSignalLocation();

android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java

@@ -1,5 +1,6 @@
 package com.onesignal.flutter;
 
+import com.onesignal.debug.internal.logging.Logging;
 import com.onesignal.OneSignal;
 import com.onesignal.Continue;
 
@@ -37,12 +38,9 @@
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class OneSignalNotifications extends FlutterRegistrarResponder implements MethodCallHandler, INotificationClickHandler, INotificationWillShowInForegroundHandler, IPermissionChangedHandler {
-    // private MethodChannel channel;
-
     private boolean hasSetNotificationWillShowInForegroundHandler = false;
     private final HashMap<String, INotificationReceivedEvent> notificationReceivedEventCache = new HashMap<>();
 
-
     static void registerWith(BinaryMessenger messenger) {
         OneSignalNotifications controller = new OneSignalNotifications();
         controller.messenger = messenger;
@@ -52,7 +50,7 @@ static void registerWith(BinaryMessenger messenger) {
 
     @Override
     public void onMethodCall(MethodCall call, Result result) {
-    if (call.method.contentEquals("OneSignal#getPermission"))
+    if (call.method.contentEquals("OneSignal#permission"))
         replySuccess(result, OneSignal.getNotifications().getPermission());
     else if (call.method.contentEquals("OneSignal#requestPermission"))
         this.requestPermission(call, result);
@@ -63,11 +61,11 @@ else if (call.method.contentEquals("OneSignal#removeGroupedNotifications"))
     else if (call.method.contentEquals("OneSignal#clearAll"))
         this.clearAll(call, result);
     else if (call.method.contentEquals("OneSignal#initNotificationOpenedHandlerParams"))
-        this.initNotificationOpenedHandlerParams();
+        this.initNotificationOpenedHandlerParams(call, result);
     else if (call.method.contentEquals("OneSignal#initNotificationWillShowInForegroundHandlerParams"))
         this.initNotificationWillShowInForegroundHandlerParams();
     else if (call.method.contentEquals("OneSignal#completeNotification"))
-        this.initNotificationWillShowInForegroundHandlerParams();
+        this.completeNotification(call, result);
     else if (call.method.contentEquals("OneSignal#lifecycleInit"))
         this.lifecycleInit();
     else
@@ -99,22 +97,23 @@ private void clearAll(MethodCall call, Result result) {
     }
 
 
-    private void initNotificationOpenedHandlerParams() {
+    private void initNotificationOpenedHandlerParams(MethodCall call, Result result) {
         OneSignal.getNotifications().setNotificationClickHandler(this);
+        replySuccess(result, null);
     }
 
 
     private void initNotificationWillShowInForegroundHandlerParams() {
         this.hasSetNotificationWillShowInForegroundHandler = true;
     }
 
-    private void completeNotification(MethodCall call, final Result reply) {
+    private void completeNotification(MethodCall call, Result result) {
         String notificationId = call.argument("notificationId");
         boolean shouldDisplay = call.argument("shouldDisplay");
         INotificationReceivedEvent notificationReceivedEvent = notificationReceivedEventCache.get(notificationId);
 
         if (notificationReceivedEvent == null) {
-            //OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR, "Could not find notification completion block with id: " + notificationId);
+            Logging.error("Could not find notification completion block with id: " + notificationId, null);
             return;
         }
 
@@ -123,6 +122,13 @@ private void completeNotification(MethodCall call, final Result reply) {
         } else {
             notificationReceivedEvent.complete(null);
         }
+
+        synchronized (notificationReceivedEvent) {
+            notificationReceivedEventCache.remove(notificationId);
+            notificationReceivedEvent.notify();
+        }
+       
+        replySuccess(result, null);
     }
 
     @Override
@@ -131,7 +137,7 @@ public void notificationClicked(INotificationClickResult result) {
             invokeMethodOnUiThread("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationClickResultToMap(result));
         } catch (JSONException e) {
             e.getStackTrace();
-            android.util.Log.w("TestHenryTest ", e.toString());
+            Logging.error("Encountered an error attempting to convert INotificationClickResult object to hash map:" + e.toString(), null);
         }
     }
 
@@ -160,18 +166,28 @@ public void notificationWillShowInForeground(INotificationReceivedEvent notifica
         try {
             HashMap<String, Object>  receivedMap = OneSignalSerializer.convertNotificationToMap(notification);
             invokeMethodOnUiThread("OneSignal#handleNotificationWillShowInForeground", receivedMap);
+            try {
+            
+                synchronized (notificationReceivedEvent) {
+                    while(notificationReceivedEventCache.containsKey(notification.getNotificationId()))
+                        notificationReceivedEvent.wait();
+                }
+            } catch(InterruptedException e){
+                Logging.error("InterruptedException" + e.toString(), null);
+            }
+           
         } catch (JSONException e) {
             e.getStackTrace();
+            Logging.error("Encountered an error attempting to convert INotification object to hash map:" + e.toString(), null);
         }
     }
 
     @Override
     public void onPermissionChanged(boolean permission)  { 
-
         invokeMethodOnUiThread("OneSignal#OSPermissionChanged", OneSignalSerializer.convertPermissionChanged(permission));
     }
 
-    public void lifecycleInit() {
+    private void lifecycleInit() {
         OneSignal.getNotifications().setNotificationWillShowInForegroundHandler(this);
         OneSignal.getNotifications().addPermissionChangedHandler(this);
     }

android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java

@@ -8,6 +8,7 @@
 
 import com.onesignal.OneSignal;
 import com.onesignal.Continue;
+import com.onesignal.common.OneSignalWrapper;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -30,20 +31,17 @@
 /** OnesignalPlugin */
 public class OneSignalPlugin extends FlutterRegistrarResponder implements FlutterPlugin, MethodCallHandler, ActivityAware {
 
-  private boolean hasSetRequiresPrivacyConsent = false;
-  private boolean waitingForUserPrivacyConsent = false;
-
   public OneSignalPlugin() {
   }
 
   private void init(Context context, BinaryMessenger messenger)
   { 
     this.context = context;
     this.messenger = messenger;
-
-    // OneSignal.sdkType = "flutter";
-
-    waitingForUserPrivacyConsent = false;
+    OneSignalWrapper.setSdkType("flutter");  
+    // For 5.0.0-beta, hard code to reflect SDK version
+    OneSignalWrapper.setSdkVersion("050000");
+    
     channel = new MethodChannel(messenger, "OneSignal");
     channel.setMethodCallHandler(this);
 
@@ -54,9 +52,6 @@ private void init(Context context, BinaryMessenger messenger)
     OneSignalUser.registerWith(messenger);
     OneSignalPushSubscription.registerWith(messenger);
     OneSignalNotifications.registerWith(messenger);
-    // OneSignalTagsController.registerWith(messenger);
-    // OneSignalInAppMessagingController.registerWith(messenger);
-    // OneSignalOutcomeEventsController.registerWith(messenger);
   }
 
   @Override
@@ -73,8 +68,6 @@ public void onDetachedFromEngine(@NonNull FlutterPlugin.FlutterPluginBinding bin
   }
 
   private void onDetachedFromEngine() {
-    // OneSignal.setNotificationOpenedHandler(null);
-    // OneSignal.setInAppMessageClickHandler(null);
   }
 
   @Override
@@ -116,7 +109,7 @@ public boolean onViewDestroy(FlutterNativeView flutterNativeView) {
   public void onMethodCall(MethodCall call, Result result) {
     if (call.method.contentEquals("OneSignal#initialize"))
       this.initWithContext(call, result);
-    else if (call.method.contentEquals("OneSignal#getRequiresPrivacyConsent"))
+    else if (call.method.contentEquals("OneSignal#requiresPrivacyConsent"))
       replySuccess(result, OneSignal.getRequiresPrivacyConsent());
     else if (call.method.contentEquals("OneSignal#setRequiresPrivacyConsent"))
       this.setRequiresPrivacyConsent(call, result);
@@ -126,6 +119,8 @@ else if (call.method.contentEquals("OneSignal#setPrivacyConsent"))
       this.setPrivacyConsent(call, result);
     else if (call.method.contentEquals("OneSignal#login"))
       this.login(call, result);
+      else if (call.method.contentEquals("OneSignal#loginWithJWT"))
+      this.loginWithJWT(call, result);
     else if (call.method.contentEquals("OneSignal#logout"))
       this.logout(call, result);
     else
@@ -135,48 +130,32 @@ else if (call.method.contentEquals("OneSignal#logout"))
   private void initWithContext(MethodCall call, Result reply) {
     String appId = call.argument("appId");
     OneSignal.initWithContext(context, appId);
-    // if (hasSetRequiresPrivacyConsent && !OneSignal.userProvidedPrivacyConsent())
-    //   this.waitingForUserPrivacyConsent = true;
-    // else
-    //   this.addObservers();
-
     replySuccess(reply, null);
   }
 
   private void setRequiresPrivacyConsent(MethodCall call, Result reply) {
     boolean required = call.argument("required");
-    
     OneSignal.setRequiresPrivacyConsent(required);
-
     replySuccess(reply, null);
   }
 
   private void setPrivacyConsent(MethodCall call, Result reply) {
     boolean granted = call.argument("granted");
     OneSignal.setPrivacyConsent(granted);
-
     replySuccess(reply, null);
   }
 
   private void login(MethodCall call, Result result) {
     OneSignal.login((String) call.argument("externalId"));
     replySuccess(result, null);
   }
+
+  private void loginWithJWT(MethodCall call, Result result) {
+    OneSignal.login((String) call.argument("externalId"), (String) call.argument("jwt"));
+    replySuccess(result, null);
+  }
   private void logout(MethodCall call, Result result) {
     OneSignal.logout();
     replySuccess(result, null);
   }
-
-  static class OSFlutterHandler extends FlutterRegistrarResponder {
-    protected final Result result;
-    protected final String methodName;
-    protected final AtomicBoolean replySubmitted = new AtomicBoolean(false);
-
-    OSFlutterHandler(BinaryMessenger messenger, MethodChannel channel, Result res, String methodName) {
-      this.messenger = messenger;
-      this.channel = channel;
-      this.result = res;
-      this.methodName = methodName;
-    }
-  }
 }

android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java

@@ -6,6 +6,8 @@
 import com.onesignal.user.subscriptions.ISubscription;
 import com.onesignal.user.subscriptions.ISubscriptionChangedHandler;
 
+import com.onesignal.debug.internal.logging.Logging;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -22,7 +24,6 @@
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, ISubscriptionChangedHandler {
-    private MethodChannel channel;
 
     static void registerWith(BinaryMessenger messenger) {
         OneSignalPushSubscription controller = new OneSignalPushSubscription();
@@ -58,17 +59,17 @@ private void optOut(MethodCall call, Result reply) {
         replySuccess(reply, null);
     }
 
-    public void lifecycleInit() {
+    private void lifecycleInit() {
         OneSignal.getUser().getPushSubscription().addChangeHandler(this);
     }  
 
     @Override
     public void onSubscriptionChanged(ISubscription subscription) { 
     if (!(subscription instanceof IPushSubscription)){
         return;
-        }
+    }
         IPushSubscription pushSubscription = (IPushSubscription) subscription;
-        invokeMethodOnUiThread("OneSignal#onSubscriptionChanged", OneSignalSerializer.convertOnSubscriptionChanged(pushSubscription));
+        invokeMethodOnUiThread("OneSignal#pushSubscriptionChanged", OneSignalSerializer.convertOnSubscriptionChanged(pushSubscription));
     }
 
 }