Merge remote-tracking branch 'origin/master'

shadowalker77 · Aug 13, 2024 · 185c04c · 185c04c
2 parents e160b8f + ff5ffb9
commit 185c04c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pushsdk/src/main/java/ir/ayantech/pushsdk/core/AyanNotification.kt b/pushsdk/src/main/java/ir/ayantech/pushsdk/core/AyanNotification.kt
@@ -16,10 +16,10 @@ import ir.ayantech.pushsdk.storage.PushUser
 @SuppressLint("StaticFieldLeak")
 object AyanNotification {
     var context: Context? = null
-    fun initialize(context: Context) {
+    fun initialize(context: Context, baseUrl: String? = null) {
         this.context = context
         PushUser.context = context
-        PushNotificationNetworking.initialize(context)
+        PushNotificationNetworking.initialize(context, baseUrl)
         if (isServerNotifiedToken() && isServerNotifiedMobile()) return
         if (PushUser.pushNotificationToken.isEmpty()) return
         if (!isServerNotifiedToken() && PushUser.pushNotificationToken.isNotEmpty())

diff --git a/pushsdk/src/main/java/ir/ayantech/pushsdk/networking/PushNotificationNetworking.kt b/pushsdk/src/main/java/ir/ayantech/pushsdk/networking/PushNotificationNetworking.kt
@@ -39,15 +39,15 @@ object PushNotificationNetworking {
     private var applicationVersion: String? = null
     private var operatorName: String? = null
 
-    fun initialize(context: Context) {
+    fun initialize(context: Context, baseUrl: String? = null) {
         this.applicationName = context.resources.getString(R.string.applicationName)
         this.applicationType = context.resources.getString(R.string.applicationType)
         this.applicationVersion = getApplicationVersion(context)
         this.operatorName = getOperatorName(context)
         ayanApi = AyanApi(
-            context,
-            { "" },
-            "https://pushnotification.infra.ayantech.ir/WebServices/App.svc/",
+            context = context,
+            getUserToken = { "" },
+            defaultBaseUrl = baseUrl ?: "https://pushnotification.infra.ayantech.ir/WebServices/App.svc/",
             logLevel = LogLevel.DO_NOT_LOG
         )
     }