Revert "Move UserState and related classes into the user directory"

This reverts commit 2cdc61f.

Author: jinliu9508

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

@@ -138,15 +138,4 @@ interface IUserManager {
      * Return a copy of all local tags from the current user.
      */
     fun getTags() : Map<String, String>
-
-    /**
-    * Add an observer to the user state, allowing the provider to be
-    * notified whenever the user state has changed.
-    */
-    fun addObserver(observer: IUserStateObserver)
-
-    /**
-     * Remove an observer from the user state.
-     */
-    fun removeObserver(observer: IUserStateObserver)
 }

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

@@ -1,12 +1,10 @@
 package com.onesignal.user.internal
 
 import com.onesignal.common.OneSignalUtils
-import com.onesignal.common.events.EventProducer
 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.internal.backend.IdentityConstants
 import com.onesignal.user.internal.identity.IdentityModel
 import com.onesignal.user.internal.identity.IdentityModelStore
@@ -31,8 +29,6 @@ internal open class UserManager(
     val subscriptions: SubscriptionList
         get() = _subscriptionManager.subscriptions
 
-    val changeHandlersNotifier = EventProducer<IUserStateObserver>()
-
     override val pushSubscription: IPushSubscription
         get() = _subscriptionManager.subscriptions.push
 
@@ -223,8 +219,4 @@ internal open class UserManager(
     override fun getTags(): Map<String, String> {
         return _propertiesModel.tags.toMap()
     }
-
-    override fun addObserver(observer: IUserStateObserver) = changeHandlersNotifier.subscribe(observer)
-
-    override fun removeObserver(observer: IUserStateObserver) = changeHandlersNotifier.unsubscribe(observer)
 }

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

@@ -20,9 +20,6 @@
     void onPushSubscriptionChange(com.onesignal.user.subscriptions.PushSubscriptionChangedState);
 }
 
--keep class ** implements com.onesignal.user.IUserStateObserver {
-    void onUserChange(com.onesignal.user.UserChangedState);
-}
 -keep class ** implements com.onesignal.notifications.INotificationServiceExtension{
    void onNotificationReceived(com.onesignal.notifications.INotificationReceivedEvent);
 }