Library structure changes

tal-mi · tal-mi · commit 698a2b3fe937 · 2025-09-03T23:36:11.000+03:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,7 @@
         </service>
 
         <receiver
-            android:name="com.sap.cdc.android.sdk.auth.notifications.CDCNotificationReceiver"
+            android:name="com.sap.cdc.android.sdk.notifications.CDCNotificationReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="approve" />
diff --git a/app/src/main/java/com/sap/cdc/bitsnbytes/cdc/AppMessagingService.kt b/app/src/main/java/com/sap/cdc/bitsnbytes/cdc/AppMessagingService.kt
@@ -2,8 +2,8 @@ package com.sap.cdc.bitsnbytes.cdc
 
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import com.sap.cdc.android.sdk.core.events.emitRemoteMessageReceived
-import com.sap.cdc.android.sdk.core.events.emitTokenReceived
+import com.sap.cdc.android.sdk.events.emitRemoteMessageReceived
+import com.sap.cdc.android.sdk.events.emitTokenReceived
 
 
 class AppMessagingService() : FirebaseMessagingService() {
diff --git a/app/src/main/java/com/sap/cdc/bitsnbytes/cdc/IdentityServiceRepository.kt b/app/src/main/java/com/sap/cdc/bitsnbytes/cdc/IdentityServiceRepository.kt
@@ -8,16 +8,16 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.sap.cdc.android.sdk.auth.AuthenticationService
 import com.sap.cdc.android.sdk.auth.IAuthResponse
 import com.sap.cdc.android.sdk.auth.ResolvableContext
-import com.sap.cdc.android.sdk.auth.notifications.IFCMTokenRequest
+import com.sap.cdc.android.sdk.notifications.IFCMTokenRequest
 import com.sap.cdc.android.sdk.auth.provider.IAuthenticationProvider
 import com.sap.cdc.android.sdk.auth.provider.IPasskeysAuthenticationProvider
 import com.sap.cdc.android.sdk.auth.provider.SSOAuthenticationProvider
 import com.sap.cdc.android.sdk.auth.provider.WebAuthenticationProvider
 import com.sap.cdc.android.sdk.auth.session.Session
 import com.sap.cdc.android.sdk.auth.session.SessionSecureLevel
 import com.sap.cdc.android.sdk.core.SiteConfig
-import com.sap.cdc.android.sdk.core.events.CDCEventBusProvider
-import com.sap.cdc.android.sdk.core.events.emitTokenReceived
+import com.sap.cdc.android.sdk.events.CDCEventBusProvider
+import com.sap.cdc.android.sdk.events.emitTokenReceived
 import com.sap.cdc.android.sdk.screensets.WebBridgeJS
 import com.sap.cdc.bitsnbytes.social.FacebookAuthenticationProvider
 import com.sap.cdc.bitsnbytes.social.GoogleAuthenticationProvider
diff --git a/app/src/main/java/com/sap/cdc/bitsnbytes/ui/activity/MainActivity.kt b/app/src/main/java/com/sap/cdc/bitsnbytes/ui/activity/MainActivity.kt
@@ -14,8 +14,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.sap.cdc.android.sdk.CDCDebuggable
-import com.sap.cdc.android.sdk.core.events.SessionEvent
-import com.sap.cdc.android.sdk.core.events.subscribeToSessionEvents
+import com.sap.cdc.android.sdk.events.SessionEvent
+import com.sap.cdc.android.sdk.events.subscribeToSessionEvents
 import com.sap.cdc.bitsnbytes.BuildConfig
 import com.sap.cdc.bitsnbytes.ui.navigation.AppStateManager
 import com.sap.cdc.bitsnbytes.ui.route.NavigationCoordinator
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/auth/AuthenticationService.kt b/library/src/main/java/com/sap/cdc/android/sdk/auth/AuthenticationService.kt
@@ -1,9 +1,9 @@
 package com.sap.cdc.android.sdk.auth
 
 import androidx.core.content.edit
-import com.sap.cdc.android.sdk.auth.notifications.CDCNotificationManager
-import com.sap.cdc.android.sdk.auth.notifications.CDCNotificationOptions
-import com.sap.cdc.android.sdk.auth.notifications.IFCMTokenRequest
+import com.sap.cdc.android.sdk.notifications.CDCNotificationManager
+import com.sap.cdc.android.sdk.notifications.CDCNotificationOptions
+import com.sap.cdc.android.sdk.notifications.IFCMTokenRequest
 import com.sap.cdc.android.sdk.auth.sequence.AuthAccount
 import com.sap.cdc.android.sdk.auth.sequence.AuthApis
 import com.sap.cdc.android.sdk.auth.sequence.AuthResolvers
@@ -17,7 +17,7 @@ import com.sap.cdc.android.sdk.auth.sequence.IAuthTFA
 import com.sap.cdc.android.sdk.auth.session.SessionService
 import com.sap.cdc.android.sdk.core.CoreClient
 import com.sap.cdc.android.sdk.core.SiteConfig
-import com.sap.cdc.android.sdk.core.events.CDCEventBusProvider
+import com.sap.cdc.android.sdk.events.CDCEventBusProvider
 import com.sap.cdc.android.sdk.extensions.getEncryptedPreferences
 import kotlinx.serialization.json.Json
 
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/auth/session/SessionSecure.kt b/library/src/main/java/com/sap/cdc/android/sdk/auth/session/SessionSecure.kt
@@ -11,11 +11,11 @@ import androidx.work.WorkerParameters
 import com.sap.cdc.android.sdk.CDCDebuggable
 import com.sap.cdc.android.sdk.auth.AuthenticationService.Companion.CDC_AUTHENTICATION_SERVICE_SECURE_PREFS
 import com.sap.cdc.android.sdk.core.SiteConfig
-import com.sap.cdc.android.sdk.core.events.EventScope
-import com.sap.cdc.android.sdk.core.events.EventSubscription
-import com.sap.cdc.android.sdk.core.events.SessionEvent
-import com.sap.cdc.android.sdk.core.events.emitSessionExpired
-import com.sap.cdc.android.sdk.core.events.subscribeToSessionEventsManual
+import com.sap.cdc.android.sdk.events.EventScope
+import com.sap.cdc.android.sdk.events.EventSubscription
+import com.sap.cdc.android.sdk.events.SessionEvent
+import com.sap.cdc.android.sdk.events.emitSessionExpired
+import com.sap.cdc.android.sdk.events.subscribeToSessionEventsManual
 import com.sap.cdc.android.sdk.extensions.getEncryptedPreferences
 import kotlinx.coroutines.Dispatchers
 import kotlinx.serialization.json.Json
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/events/CDCEvent.kt b/library/src/main/java/com/sap/cdc/android/sdk/events/CDCEvent.kt
@@ -1,6 +1,6 @@
-package com.sap.cdc.android.sdk.core.events
+package com.sap.cdc.android.sdk.events
 
-import com.sap.cdc.android.sdk.auth.notifications.CDCNotificationActionData
+import com.sap.cdc.android.sdk.notifications.CDCNotificationActionData
 import java.util.UUID
 
 /**
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/events/CDCEventBusProvider.kt b/library/src/main/java/com/sap/cdc/android/sdk/events/CDCEventBusProvider.kt
@@ -1,4 +1,4 @@
-package com.sap.cdc.android.sdk.core.events
+package com.sap.cdc.android.sdk.events
 
 /**
  * Global provider for the CDC Event Bus instance.
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/events/CDCLifecycleEventBus.kt b/library/src/main/java/com/sap/cdc/android/sdk/events/CDCLifecycleEventBus.kt
@@ -1,4 +1,4 @@
-package com.sap.cdc.android.sdk.core.events
+package com.sap.cdc.android.sdk.events
 
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.Lifecycle
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/events/EventBusExtensions.kt b/library/src/main/java/com/sap/cdc/android/sdk/events/EventBusExtensions.kt
@@ -1,7 +1,7 @@
-package com.sap.cdc.android.sdk.core.events
+package com.sap.cdc.android.sdk.events
 
 import androidx.lifecycle.LifecycleOwner
-import com.sap.cdc.android.sdk.auth.notifications.CDCNotificationActionData
+import com.sap.cdc.android.sdk.notifications.CDCNotificationActionData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/events/EventScope.kt b/library/src/main/java/com/sap/cdc/android/sdk/events/EventScope.kt
@@ -1,4 +1,6 @@
-package com.sap.cdc.android.sdk.core.events
+package com.sap.cdc.android.sdk.events
+
+import kotlin.reflect.KClass
 
 /**
  * Defines the scope for event distribution in the lifecycle-aware event bus.
@@ -40,6 +42,6 @@ sealed class EventScope {
  * Combines event class type with scope for unique identification.
  */
 internal data class EventKey(
-    val eventClass: kotlin.reflect.KClass<*>,
+    val eventClass: KClass<*>,
     val scope: EventScope
 )
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/events/EventSubscription.kt b/library/src/main/java/com/sap/cdc/android/sdk/events/EventSubscription.kt
@@ -1,4 +1,4 @@
-package com.sap.cdc.android.sdk.core.events
+package com.sap.cdc.android.sdk.events
 
 /**
  * Represents a manual event subscription that can be controlled and cleaned up.
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/events/LifecycleAwareEventBus.kt b/library/src/main/java/com/sap/cdc/android/sdk/events/LifecycleAwareEventBus.kt
@@ -1,4 +1,4 @@
-package com.sap.cdc.android.sdk.core.events
+package com.sap.cdc.android.sdk.events
 
 import androidx.lifecycle.LifecycleOwner
 import kotlinx.coroutines.CoroutineDispatcher
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/notifications/NotificationEntities.kt b/library/src/main/java/com/sap/cdc/android/sdk/notifications/NotificationEntities.kt
@@ -1,5 +1,6 @@
-package com.sap.cdc.android.sdk.auth.notifications
+package com.sap.cdc.android.sdk.notifications
 
+import android.R
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import java.util.concurrent.TimeUnit
@@ -10,7 +11,7 @@ import java.util.concurrent.TimeUnit
 data class CDCNotificationOptions(
     val contentView: Class<*>? = null, // Class used for setContent
     val actionsReceiver: Class<*>? = CDCNotificationReceiver::class.java,
-    val smallIcon: Int? = android.R.drawable.ic_dialog_info,
+    val smallIcon: Int? = R.drawable.ic_dialog_info,
     val backgroundColor: Int? = null, // argb color
     val autoCancel: Boolean? = true,
     val timeout: Long? = TimeUnit.SECONDS.toMillis(5),
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/notifications/NotificationsManager.kt b/library/src/main/java/com/sap/cdc/android/sdk/notifications/NotificationsManager.kt
@@ -1,5 +1,6 @@
-package com.sap.cdc.android.sdk.auth.notifications
+package com.sap.cdc.android.sdk.notifications
 
+import android.R
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -10,9 +11,9 @@ import androidx.core.app.NotificationManagerCompat
 import com.sap.cdc.android.sdk.CDCDebuggable
 import com.sap.cdc.android.sdk.auth.AuthenticationService
 import com.sap.cdc.android.sdk.auth.DeviceInfo
-import com.sap.cdc.android.sdk.core.events.EventSubscription
-import com.sap.cdc.android.sdk.core.events.MessageEvent
-import com.sap.cdc.android.sdk.core.events.subscribeToMessageEventsManual
+import com.sap.cdc.android.sdk.events.EventSubscription
+import com.sap.cdc.android.sdk.events.MessageEvent
+import com.sap.cdc.android.sdk.events.subscribeToMessageEventsManual
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -272,7 +273,7 @@ class CDCNotificationManager(
         // Build notification.
         val builder: NotificationCompat.Builder =
             NotificationCompat.Builder(context, CDC_NOTIFICATIONS_CHANNEL_ID)
-                .setSmallIcon(android.R.drawable.ic_dialog_info)
+                .setSmallIcon(R.drawable.ic_dialog_info)
                 .setContentTitle(title?.trim { it <= ' ' } ?: "")
                 .setContentText(body?.trim { it <= ' ' } ?: "")
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
@@ -336,12 +337,12 @@ class CDCNotificationManager(
 
         builder
             .addAction(
-                android.R.drawable.ic_menu_close_clear_cancel,
+                R.drawable.ic_menu_close_clear_cancel,
                 notificationOptions.actionNegative?.title ?: "Deny",
                 denyPendingIntent
             )
             .addAction(
-                android.R.drawable.ic_menu_save,
+                R.drawable.ic_menu_save,
                 notificationOptions.actionPositive?.title ?: "Approve",
                 approvePendingIntent
             )
diff --git a/library/src/main/java/com/sap/cdc/android/sdk/notifications/NotificationsReceiver.kt b/library/src/main/java/com/sap/cdc/android/sdk/notifications/NotificationsReceiver.kt
@@ -1,13 +1,13 @@
-package com.sap.cdc.android.sdk.auth.notifications
+package com.sap.cdc.android.sdk.notifications
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationManagerCompat
 import com.sap.cdc.android.sdk.CDCDebuggable
-import com.sap.cdc.android.sdk.core.events.CDCEventBusProvider
-import com.sap.cdc.android.sdk.core.events.emitNotificationActionReceived
+import com.sap.cdc.android.sdk.events.CDCEventBusProvider
+import com.sap.cdc.android.sdk.events.emitNotificationActionReceived
 
 /**
  * Notification receiver for push authentication flows.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.sap.cdc.android.sdk.core.events`
	`1`	`+package com.sap.cdc.android.sdk.events`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Global provider for the CDC Event Bus instance.`