Adding pushSubscription state and notification permission state as properties, adding lifecycleInit to iOS class

Author: fhboswell

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

@@ -52,7 +52,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);

example/lib/main.dart

@@ -118,6 +118,9 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
 
   void onOSPushSubscriptionChangedWithStateChanges(
       OSPushSubscriptionStateChanges stateChanges) {
+    print(OneSignal.User.pushSubscription.optedIn());
+    print(OneSignal.User.pushSubscription.id());
+    print(OneSignal.User.pushSubscription.token());
     print(stateChanges.jsonRepresentation());
   }
 

ios/Classes/OSFlutterPushSubscription.m

@@ -53,9 +53,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         [self optIn:call withResult:result];
     else if ([@"OneSignal#optOut" isEqualToString:call.method])
         [self optOut:call withResult:result];
-    else if ([@"OneSignal#addObserver" isEqualToString:call.method])
-        [self addObserver:call withResult:result];
-    else if ([@"OneSignal#removeObserver" isEqualToString:call.method])
+     else if ([@"OneSignal#lifecycleInit" isEqualToString:call.method])
         [self removeObserver:call withResult:result];
     else
         result(FlutterMethodNotImplemented);
@@ -71,17 +69,11 @@ - (void)optOut:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     result(nil);
 }
 
-- (void)addObserver:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+- (void)lifecycleInit:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     [OneSignal.User.pushSubscription addObserver:self];
     result(nil);
 }
 
-// TODO: possibly don't need
-- (void)removeObserver:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-    [OneSignal.User.pushSubscription removeObserver:self];
-    result(nil);
-}
-
 - (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges*)stateChanges {
     [self.channel invokeMethod:@"OneSignal#pushSubscriptionChanged" arguments:stateChanges.jsonRepresentation];
 }

lib/src/inappmessages.dart

@@ -64,7 +64,7 @@ class OneSignalInAppMessages {
     return await _channel.invokeMethod("OneSignal#arePaused");
   }
 
-  Future<bool> lifecycleInit() async {
+  Future<void> lifecycleInit() async {
     return await _channel.invokeMethod("OneSignal#lifecycleInit");
   }
 

lib/src/notifications.dart

@@ -25,9 +25,11 @@ class OneSignalNotifications {
     this._channel.setMethodCallHandler(_handleMethod);
   }
 
+  bool _permission = false;
+
   /// Whether this app has push notification permission.
-  Future<bool> permission() async {
-    return await _channel.invokeMethod("OneSignal#permission");
+  bool permission() {
+    return _permission;
   }
 
   /// Whether attempting to request notification permission will show a prompt.
@@ -80,7 +82,8 @@ class OneSignalNotifications {
     _observers.remove(observer);
   }
 
-  Future<bool> lifecycleInit() async {
+  Future<void> lifecycleInit() async {
+    _permission = await _channel.invokeMethod("OneSignal#permission");
     return await _channel.invokeMethod("OneSignal#lifecycleInit");
   }
 
@@ -102,6 +105,7 @@ class OneSignalNotifications {
   }
 
   Future<void> onOSPermissionChangedHandler(OSPermissionState state) async {
+    _permission = state.permission;
     for (var observer in _observers) {
       observer.onOSPermissionChanged(state);
     }

lib/src/pushsubscription.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:ffi';
 import 'dart:io' show Platform;
 import 'package:flutter/services.dart';
 import 'package:onesignal_flutter/src/defines.dart';
@@ -7,6 +8,10 @@ import 'package:onesignal_flutter/src/subscription.dart';
 class OneSignalPushSubscription {
   MethodChannel _channel = const MethodChannel('OneSignal#pushsubscription');
 
+  String? _id;
+  String? _token;
+  bool? _optedIn;
+
   List<OneSignalPushSubscriptionObserver> _observers =
       <OneSignalPushSubscriptionObserver>[];
   // constructor method
@@ -19,26 +24,22 @@ class OneSignalPushSubscription {
     _channel.invokeMethod("OneSignal#addObserver");
   }
 
-  // TODO: convert these syncronous by capturing an initial state and the following the stateChanges
-
-  /// The readonly push subscription ID.
-  Future<String> id() async {
-    return await _channel.invokeMethod("OneSignal#pushSubscriptionToken");
+  String? id() {
+    return this._id;
   }
 
   /// The readonly push token.
-  Future<String> token() async {
-    return await _channel.invokeMethod("OneSignal#pushSubscriptionToken");
+  String? token() {
+    return this._token;
   }
 
   /// Gets a boolean value indicating whether the current user is opted in to push notifications.
   /// This returns true when the app has notifications permission and optedOut is called.
   /// Note: Does not take into account the existence of the subscription ID and push token.
   /// This boolean may return true but push notifications may still not be received by the user.
-  Future<bool> optedIn() async {
-    return await _channel.invokeMethod("OneSignal#pushSubscriptionOptedIn");
+  bool? optedIn() {
+    return _optedIn;
   }
-  // TODO: END
 
   /// Call this method to receive push notifications on the device or to resume receiving of
   /// push notifications after calling optOut. If needed, this method will prompt the user for
@@ -65,7 +66,10 @@ class OneSignalPushSubscription {
     _observers.remove(observer);
   }
 
-  Future<bool> lifecycleInit() async {
+  Future<void> lifecycleInit() async {
+    _token = await _channel.invokeMethod("OneSignal#pushSubscriptionToken");
+    _id = await _channel.invokeMethod("OneSignal#pushSubscriptionId");
+    _optedIn = await _channel.invokeMethod("OneSignal#pushSubscriptionOptedIn");
     return await _channel.invokeMethod("OneSignal#lifecycleInit");
   }
 
@@ -80,6 +84,10 @@ class OneSignalPushSubscription {
 
   Future<void> _onSubscriptionChangedHandler(
       OSPushSubscriptionStateChanges stateChanges) async {
+    this._id = stateChanges.to.id;
+    this._token = stateChanges.to.token;
+    this._optedIn = stateChanges.to.optedIn;
+
     for (var observer in _observers) {
       observer.onOSPushSubscriptionChangedWithStateChanges(stateChanges);
     }