Skip to content

Apple platform fixes #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jguz-pubnub merged 3 commits into from
Mar 7, 2025
Merged

Apple platform fixes #337

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2895b5
Apple platform fixes
jguz-pubnub Mar 6, 2025
ee6be06
Remove no longer used method
jguz-pubnub Mar 6, 2025
3f6d6b5
PubNub SDK v10.4.4 release.
pubnub-release-bot Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dokka = "1.9.20"
kotlinx_datetime = "0.6.1"
kotlinx_coroutines = "1.9.0"
pubnub_js = "8.6.0"
pubnub_swift = "8.3.0"
pubnub_swift = "9.0.0"

[libraries]
retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" }
Expand Down
23 changes: 9 additions & 14 deletions ...ub-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/AddChannelsToPush.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.pubnub.api.endpoints.push

import cocoapods.PubNubSwift.KMPPubNub
import cocoapods.PubNubSwift.addChannelsToPushNotificationsWithChannels
import com.pubnub.api.PubNubException
import com.pubnub.api.enums.PNPushEnvironment
import com.pubnub.api.enums.PNPushType
import com.pubnub.api.models.consumer.push.PNPushAddChannelResult
Expand All @@ -11,9 +10,7 @@ import com.pubnub.api.v2.callbacks.Result
import com.pubnub.kmp.PNFuture
import com.pubnub.kmp.onFailureHandler
import com.pubnub.kmp.onSuccessHandler
import com.pubnub.kmp.toNSData
import kotlinx.cinterop.ExperimentalForeignApi
import platform.Foundation.NSData

/**
* @see [PubNub.addPushNotificationsOnChannels]
Expand All @@ -30,16 +27,14 @@ class AddChannelsToPushImpl(
private val environment: PNPushEnvironment
) : AddChannelsToPush {
override fun async(callback: Consumer<Result<PNPushAddChannelResult>>) {
deviceId.toNSData()?.let { data: NSData ->
pubnub.addChannelsToPushNotificationsWithChannels(
channels = channels,
deviceId = data,
pushType = pushType.toParamString(),
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessHandler { PNPushAddChannelResult() },
onFailure = callback.onFailureHandler()
)
} ?: callback.accept(Result.failure(PubNubException("Cannot create NSData from $deviceId")))
pubnub.addChannelsToPushNotificationsWithChannels(
channels = channels,
deviceId = deviceId,
pushType = pushType.toParamString(),
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessHandler { PNPushAddChannelResult() },
onFailure = callback.onFailureHandler()
)
}
}
25 changes: 12 additions & 13 deletions ...b-kotlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/ListPushProvisions.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.pubnub.api.endpoints.push

import cocoapods.PubNubSwift.KMPPubNub
import cocoapods.PubNubSwift.listPushChannelsWithDeviceId
import com.pubnub.api.PubNubException
import com.pubnub.api.enums.PNPushEnvironment
import com.pubnub.api.enums.PNPushType
import com.pubnub.api.models.consumer.push.PNPushListProvisionsResult
Expand All @@ -11,9 +10,7 @@ import com.pubnub.api.v2.callbacks.Result
import com.pubnub.kmp.PNFuture
import com.pubnub.kmp.onFailureHandler
import com.pubnub.kmp.onSuccessHandler
import com.pubnub.kmp.toNSData
import kotlinx.cinterop.ExperimentalForeignApi
import platform.Foundation.NSData

/**
* @see [PubNub.auditPushChannelProvisions]
Expand All @@ -29,15 +26,17 @@ class ListPushProvisionsImpl(
private val environment: PNPushEnvironment
) : ListPushProvisions {
override fun async(callback: Consumer<Result<PNPushListProvisionsResult>>) {
deviceId.toNSData()?.let { data: NSData ->
pubnub.listPushChannelsWithDeviceId(
deviceId = data,
pushType = pushType.toParamString(),
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessHandler { PNPushListProvisionsResult(channels = it?.filterIsInstance<String>() ?: emptyList()) },
onFailure = callback.onFailureHandler()
)
} ?: callback.accept(Result.failure(PubNubException("Cannot create NSData from $deviceId")))
pubnub.listPushChannelsWithDeviceId(
deviceId = deviceId,
pushType = pushType.toParamString(),
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessHandler {
PNPushListProvisionsResult(
channels = it?.filterIsInstance<String>() ?: emptyList()
)
},
onFailure = callback.onFailureHandler()
)
}
}
21 changes: 8 additions & 13 deletions .../src/appleMain/kotlin/com/pubnub/api/endpoints/push/RemoveAllPushChannelsForDevice.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.pubnub.api.endpoints.push

import cocoapods.PubNubSwift.KMPPubNub
import cocoapods.PubNubSwift.removeAllChannelsFromPushWithPushType
import com.pubnub.api.PubNubException
import com.pubnub.api.enums.PNPushEnvironment
import com.pubnub.api.enums.PNPushType
import com.pubnub.api.models.consumer.push.PNPushRemoveAllChannelsResult
Expand All @@ -11,9 +10,7 @@ import com.pubnub.api.v2.callbacks.Result
import com.pubnub.kmp.PNFuture
import com.pubnub.kmp.onFailureHandler
import com.pubnub.kmp.onSuccessReturnValue
import com.pubnub.kmp.toNSData
import kotlinx.cinterop.ExperimentalForeignApi
import platform.Foundation.NSData

/**
* @see [PubNub.removeAllPushNotificationsFromDeviceWithPushToken]
Expand All @@ -29,15 +26,13 @@ class RemoveAllPushChannelsForDeviceImpl(
private val environment: PNPushEnvironment
) : RemoveAllPushChannelsForDevice {
override fun async(callback: Consumer<Result<PNPushRemoveAllChannelsResult>>) {
deviceId.toNSData()?.let { data: NSData ->
pubnub.removeAllChannelsFromPushWithPushType(
pushType = pushType.toParamString(),
deviceId = data,
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessReturnValue(PNPushRemoveAllChannelsResult()),
onFailure = callback.onFailureHandler()
)
} ?: callback.accept(Result.failure(PubNubException("Cannot create NSData from $deviceId")))
pubnub.removeAllChannelsFromPushWithPushType(
pushType = pushType.toParamString(),
deviceId = deviceId,
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessReturnValue(PNPushRemoveAllChannelsResult()),
onFailure = callback.onFailureHandler()
)
}
}
23 changes: 9 additions & 14 deletions ...tlin-api/src/appleMain/kotlin/com/pubnub/api/endpoints/push/RemoveChannelsFromPush.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.pubnub.api.endpoints.push

import cocoapods.PubNubSwift.KMPPubNub
import cocoapods.PubNubSwift.removeChannelsFromPushWithChannels
import com.pubnub.api.PubNubException
import com.pubnub.api.enums.PNPushEnvironment
import com.pubnub.api.enums.PNPushType
import com.pubnub.api.models.consumer.push.PNPushRemoveChannelResult
Expand All @@ -11,9 +10,7 @@ import com.pubnub.api.v2.callbacks.Result
import com.pubnub.kmp.PNFuture
import com.pubnub.kmp.onFailureHandler
import com.pubnub.kmp.onSuccessHandler
import com.pubnub.kmp.toNSData
import kotlinx.cinterop.ExperimentalForeignApi
import platform.Foundation.NSData

/**
* @see [PubNub.removePushNotificationsFromChannels]
Expand All @@ -30,16 +27,14 @@ class RemoveChannelsFromPushImpl(
private val environment: PNPushEnvironment,
) : RemoveChannelsFromPush {
override fun async(callback: Consumer<Result<PNPushRemoveChannelResult>>) {
deviceId.toNSData()?.let { data: NSData ->
pubnub.removeChannelsFromPushWithChannels(
channels = channels,
deviceId = data,
pushType = pushType.toParamString(),
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessHandler { PNPushRemoveChannelResult() },
onFailure = callback.onFailureHandler()
)
} ?: callback.accept(Result.failure(PubNubException("Cannot create NSData from $deviceId")))
pubnub.removeChannelsFromPushWithChannels(
channels = channels,
deviceId = deviceId,
pushType = pushType.toParamString(),
topic = topic.orEmpty(),
environment = environment.toParamString(),
onSuccess = callback.onSuccessHandler { PNPushRemoveChannelResult() },
onFailure = callback.onFailureHandler()
)
}
}
8 changes: 0 additions & 8 deletions pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/converters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ import com.pubnub.api.models.consumer.objects.membership.PNChannelMembership
import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadata
import com.pubnub.api.utils.PatchValue
import kotlinx.cinterop.ExperimentalForeignApi
import platform.Foundation.NSData
import platform.Foundation.NSString
import platform.Foundation.NSUTF8StringEncoding
import platform.Foundation.dataUsingEncoding

internal fun String.toNSData(): NSData? {
return (this as NSString).dataUsingEncoding(NSUTF8StringEncoding)
}

@OptIn(ExperimentalForeignApi::class)
internal fun createPubNubHashedPage(from: PNPage?): KMPHashedPage {
Expand Down
Loading