Improve comments

Author: jinliu9508

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -8,7 +8,6 @@
 import androidx.multidex.MultiDexApplication;
 
 import com.onesignal.OneSignal;
-import com.onesignal.inAppMessages.IInAppMessage;
 import com.onesignal.inAppMessages.IInAppMessageClickListener;
 import com.onesignal.inAppMessages.IInAppMessageClickEvent;
 import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
@@ -26,9 +25,9 @@
 import com.onesignal.sdktest.constant.Text;
 import com.onesignal.sdktest.notification.OneSignalNotificationSender;
 import com.onesignal.sdktest.util.SharedPreferenceUtil;
-import com.onesignal.user.IUserStateObserver;
-import com.onesignal.user.UserChangedState;
-import com.onesignal.user.UserState;
+import com.onesignal.user.state.IUserStateObserver;
+import com.onesignal.user.state.UserChangedState;
+import com.onesignal.user.state.UserState;
 
 import org.json.JSONObject;
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt

@@ -1,6 +1,7 @@
 package com.onesignal.user
 
 import com.onesignal.OneSignal
+import com.onesignal.user.state.IUserStateObserver
 import com.onesignal.user.subscriptions.IPushSubscription
 
 /**
@@ -26,12 +27,12 @@ interface IUserManager {
     val pushSubscription: IPushSubscription
 
     /**
-     * onesignalId, null if this is current unavailable
+     * onesignalId, empty if this is current unavailable
      */
     val onesignalId: String
 
     /**
-     * externalId, null if this is current unavailable
+     * externalId, empty if this is current unavailable
      */
     val externalId: String
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt

@@ -9,16 +9,16 @@ import com.onesignal.core.internal.language.ILanguageContext
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.user.IUserManager
-import com.onesignal.user.IUserStateObserver
-import com.onesignal.user.UserChangedState
-import com.onesignal.user.UserState
 import com.onesignal.user.internal.backend.IdentityConstants
 import com.onesignal.user.internal.identity.IdentityModel
 import com.onesignal.user.internal.identity.IdentityModelStore
 import com.onesignal.user.internal.properties.PropertiesModel
 import com.onesignal.user.internal.properties.PropertiesModelStore
 import com.onesignal.user.internal.subscriptions.ISubscriptionManager
 import com.onesignal.user.internal.subscriptions.SubscriptionList
+import com.onesignal.user.state.IUserStateObserver
+import com.onesignal.user.state.UserChangedState
+import com.onesignal.user.state.UserState
 import com.onesignal.user.subscriptions.IPushSubscription
 
 internal open class UserManager(
@@ -259,6 +259,5 @@ internal open class UserManager(
                 it.onUserStateChange(UserChangedState(newUserState))
             }
         }
-        Logging.debug(args.property)
     }
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt renamed to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/state/IUserStateObserver.kt

@@ -1,8 +1,8 @@
-package com.onesignal.user
+package com.onesignal.user.state
 
 /**
- * A user state changed handler. Implement this interface and provide the implementation
- * to be notified when the user has changed.
+ * A user state changed observer. Implement this interface and provide the implementation
+ * to be notified when the user state has changed.
  */
 interface IUserStateObserver {
     /**

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt renamed to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/state/UserChangedState.kt

@@ -1,4 +1,4 @@
-package com.onesignal.user
+package com.onesignal.user.state
 
 import org.json.JSONObject
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt renamed to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/state/UserState.kt

@@ -1,4 +1,4 @@
-package com.onesignal.user
+package com.onesignal.user.state
 
 import org.json.JSONObject
 
@@ -13,10 +13,9 @@ class UserState(
      */
     val onesignalId: String,
     /**
-     * The external identifier that you use to identify users. This will be an empty string
-     * until the user has been successfully logged in on the backend and assigned an ID.
-     * Use [addObserver] to be notified when the [externalId] has
-     * been successfully assigned.
+     * The external identifier that you use to identify users. Use [addObserver] to be notified
+     * when the [externalId] has been successfully assigned. This will be an empty string if no
+     * external identifier has been assigned to the associated [onesignalId].
      */
     val externalId: String,
 ) {

OneSignalSDK/onesignal/notifications/consumer-rules.pro

@@ -20,8 +20,8 @@
     void onPushSubscriptionChange(com.onesignal.user.subscriptions.PushSubscriptionChangedState);
 }
 
--keep class ** implements com.onesignal.user.IUserStateObserver {
-    void onUserStateChange(com.onesignal.user.UserChangedState);
+-keep class ** implements com.onesignal.user.state.IUserStateObserver {
+    void onUserStateChange(com.onesignal.user.state.UserChangedState);
 }
 
 -keep class ** implements com.onesignal.notifications.INotificationServiceExtension{