Skip to content

Commit 9831006

Browse files
committed
Add check for subscriptionId
Change canStartExecute in UpdateSubscriptionOperation and DeleteSubscriptionOperation to match TransferSubscriptionOperation
1 parent 3b7e5d6 commit 9831006

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class DeleteSubscriptionOperation() : Operation(SubscriptionOperationExecutor.DE
4141
override val createComparisonKey: String get() = "$appId.User.$onesignalId"
4242
override val modifyComparisonKey: String get() = "$appId.User.$onesignalId.Subscription.$subscriptionId"
4343
override val groupComparisonType: GroupComparisonType = GroupComparisonType.NONE
44-
override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) && !IDManager.isLocalId(onesignalId)
44+
override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) && !IDManager.isLocalId(subscriptionId)
4545
override val applyToRecordId: String get() = subscriptionId
4646

4747
constructor(appId: String, onesignalId: String, subscriptionId: String) : this() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class UpdateSubscriptionOperation() : Operation(SubscriptionOperationExecutor.UP
8484
override val createComparisonKey: String get() = "$appId.User.$onesignalId"
8585
override val modifyComparisonKey: String get() = "$appId.User.$onesignalId.Subscription.$subscriptionId"
8686
override val groupComparisonType: GroupComparisonType = GroupComparisonType.ALTER
87-
override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) && !IDManager.isLocalId(onesignalId)
87+
override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) && !IDManager.isLocalId(subscriptionId)
8888
override val applyToRecordId: String get() = subscriptionId
8989

9090
constructor(appId: String, onesignalId: String, subscriptionId: String, type: SubscriptionType, enabled: Boolean, address: String, status: SubscriptionStatus) : this() {

0 commit comments

Comments
 (0)