Skip to content

Commit ca1dc4d

Browse files
committed
nit: lint fixes
1 parent 8c0e29e commit ca1dc4d

File tree

5 files changed

+45
-36
lines changed

5 files changed

+45
-36
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,19 @@ abstract class Operation(name: String) : Model() {
5757
*/
5858
var operationJwt: String?
5959
get() = getOptStringProperty("_jwt")
60-
set(value) { setOptStringProperty("_jwt", value, ModelChangeTags.NO_PROPOGATE, true) }
60+
set(value) {
61+
setOptStringProperty("_jwt", value, ModelChangeTags.NO_PROPOGATE, true)
62+
}
6163

6264
/**
6365
* The external ID of the user who created this operation, stamped at enqueue time.
6466
* Used to associate operations with specific users for multi-user JWT management.
6567
*/
6668
var operationExternalId: String?
6769
get() = getOptStringProperty("_externalId")
68-
set(value) { setOptStringProperty("_externalId", value, ModelChangeTags.NO_PROPOGATE, true) }
70+
set(value) {
71+
setOptStringProperty("_externalId", value, ModelChangeTags.NO_PROPOGATE, true)
72+
}
6973

7074
/**
7175
* Whether this operation requires JWT authentication when identity verification is enabled.

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,10 @@ internal class OperationRepo(
432432

433433
val useIV = _configModelStore.model.useIdentityVerification
434434
if (useIV) {
435-
val toDiscard = queue.filter {
436-
it.operation.operationExternalId == null && it.operation.requiresJwt
437-
}
435+
val toDiscard =
436+
queue.filter {
437+
it.operation.operationExternalId == null && it.operation.requiresJwt
438+
}
438439
for (item in toDiscard) {
439440
Logging.debug("getNextOps: discarding anonymous op: ${item.operation}")
440441
queue.remove(item)

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/RefreshUserOperationExecutor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import com.onesignal.core.internal.operations.Operation
1111
import com.onesignal.debug.LogLevel
1212
import com.onesignal.debug.internal.logging.Logging
1313
import com.onesignal.user.internal.backend.IUserBackendService
14+
import com.onesignal.user.internal.backend.IdentityConstants
1415
import com.onesignal.user.internal.backend.SubscriptionObjectType
1516
import com.onesignal.user.internal.builduser.IRebuildUserService
16-
import com.onesignal.user.internal.backend.IdentityConstants
1717
import com.onesignal.user.internal.identity.IdentityModel
1818
import com.onesignal.user.internal.identity.IdentityModelStore
1919
import com.onesignal.user.internal.operations.RefreshUserOperation

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,13 @@ class RefreshUserOperationExecutorTests : FunSpec({
338338
val mockUserBackendService = mockk<IUserBackendService>()
339339
coEvery {
340340
mockUserBackendService.getUser(appId, IdentityConstants.EXTERNAL_ID, previousUserExternalId, previousUserJwt)
341-
} returns CreateUserResponse(
342-
mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId, IdentityConstants.EXTERNAL_ID to previousUserExternalId),
343-
PropertiesObject(),
344-
listOf(),
345-
null,
346-
)
341+
} returns
342+
CreateUserResponse(
343+
mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId, IdentityConstants.EXTERNAL_ID to previousUserExternalId),
344+
PropertiesObject(),
345+
listOf(),
346+
null,
347+
)
347348

348349
val mockIdentityModelStore = MockHelper.identityModelStore()
349350
val mockIdentityModel = IdentityModel()
@@ -385,12 +386,13 @@ class RefreshUserOperationExecutorTests : FunSpec({
385386
val mockUserBackendService = mockk<IUserBackendService>()
386387
coEvery {
387388
mockUserBackendService.getUser(appId, IdentityConstants.ONESIGNAL_ID, remoteOneSignalId, null)
388-
} returns CreateUserResponse(
389-
mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId),
390-
PropertiesObject(),
391-
listOf(),
392-
null,
393-
)
389+
} returns
390+
CreateUserResponse(
391+
mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId),
392+
PropertiesObject(),
393+
listOf(),
394+
null,
395+
)
394396

395397
val mockIdentityModelStore = MockHelper.identityModelStore()
396398
val mockIdentityModel = IdentityModel()

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -829,15 +829,16 @@ class SubscriptionOperationExecutorTests :
829829
mockConsistencyManager,
830830
)
831831

832-
val createOp = CreateSubscriptionOperation(
833-
appId,
834-
remoteOneSignalId,
835-
localSubscriptionId,
836-
SubscriptionType.PUSH,
837-
true,
838-
"pushToken1",
839-
SubscriptionStatus.SUBSCRIBED,
840-
)
832+
val createOp =
833+
CreateSubscriptionOperation(
834+
appId,
835+
remoteOneSignalId,
836+
localSubscriptionId,
837+
SubscriptionType.PUSH,
838+
true,
839+
"pushToken1",
840+
SubscriptionStatus.SUBSCRIBED,
841+
)
841842
createOp.operationJwt = previousUserJwt
842843
createOp.operationExternalId = previousUserExternalId
843844
val operations = listOf<Operation>(createOp)
@@ -885,15 +886,16 @@ class SubscriptionOperationExecutorTests :
885886
mockConsistencyManager,
886887
)
887888

888-
val createOp = CreateSubscriptionOperation(
889-
appId,
890-
remoteOneSignalId,
891-
localSubscriptionId,
892-
SubscriptionType.PUSH,
893-
true,
894-
"pushToken1",
895-
SubscriptionStatus.SUBSCRIBED,
896-
)
889+
val createOp =
890+
CreateSubscriptionOperation(
891+
appId,
892+
remoteOneSignalId,
893+
localSubscriptionId,
894+
SubscriptionType.PUSH,
895+
true,
896+
"pushToken1",
897+
SubscriptionStatus.SUBSCRIBED,
898+
)
897899
val operations = listOf<Operation>(createOp)
898900

899901
// When

0 commit comments

Comments
 (0)