Skip to content

Commit bbeb09d

Browse files
brismithersbrismithers
committed
Updates for lintcheck
1 parent 28dac77 commit bbeb09d

File tree

10 files changed

+25
-26
lines changed

10 files changed

+25
-26
lines changed

‎OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IDisplayableMutableNotification.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ package com.onesignal.notifications
33
/**
44
* An [INotification] that is both an [IMutableNotification] and an [IDisplayableNotification].
55
*/
6-
interface IDisplayableMutableNotification : IMutableNotification, IDisplayableNotification {
7-
}
6+
interface IDisplayableMutableNotification : IMutableNotification, IDisplayableNotification

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/Notification.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,10 @@ class Notification : IDisplayableMutableNotification {
137137
for (i in 0 until jsonActionButtons.length()) {
138138
val jsonActionButton = jsonActionButtons.getJSONObject(i)
139139
val actionButton = ActionButton(
140-
jsonActionButton.safeString("id"),
141-
jsonActionButton.safeString("text"),
142-
jsonActionButton.safeString("icon"))
140+
jsonActionButton.safeString("id"),
141+
jsonActionButton.safeString("text"),
142+
jsonActionButton.safeString("icon"),
143+
)
143144
actionBtns.add(actionButton)
144145
}
145146
actionButtons = actionBtns
@@ -251,7 +252,7 @@ class Notification : IDisplayableMutableNotification {
251252
class ActionButton(
252253
override val id: String? = null,
253254
override val text: String? = null,
254-
override val icon: String? = null
255+
override val icon: String? = null,
255256
) : IActionButton {
256257
fun toJSONObject(): JSONObject {
257258
val json = JSONObject()

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/NotificationClickEvent.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.onesignal.notifications.internal
22

33
import com.onesignal.notifications.INotification
4-
import com.onesignal.notifications.INotificationClickResult
5-
import com.onesignal.notifications.INotificationClickListener
64
import com.onesignal.notifications.INotificationClickEvent
5+
import com.onesignal.notifications.INotificationClickListener
6+
import com.onesignal.notifications.INotificationClickResult
77
import org.json.JSONObject
88

99
/**
@@ -12,7 +12,7 @@ import org.json.JSONObject
1212
*/
1313
internal class NotificationClickEvent(
1414
private val _notification: Notification,
15-
private val _result: NotificationClickResult
15+
private val _result: NotificationClickResult,
1616
) : INotificationClickEvent {
1717

1818
/** The notification that was opened by the user. **/

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationGenerationJob.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import java.security.SecureRandom
88

99
class NotificationGenerationJob(
1010
private var _notification: Notification,
11-
var jsonPayload: JSONObject
11+
var jsonPayload: JSONObject,
1212
) {
1313
var notification: Notification
1414
get() = _notification

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import com.onesignal.core.internal.time.ITime
1515
import com.onesignal.debug.internal.logging.Logging
1616
import com.onesignal.notifications.INotification
1717
import com.onesignal.notifications.INotificationClickResult
18-
import com.onesignal.notifications.internal.NotificationClickResult
1918
import com.onesignal.notifications.internal.NotificationClickEvent
19+
import com.onesignal.notifications.internal.NotificationClickResult
2020
import org.json.JSONArray
2121
import org.json.JSONException
2222
import org.json.JSONObject

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ internal class NotificationGenerationProcessor(
7474
GlobalScope.launch(Dispatchers.IO) {
7575
_lifecycleService.externalRemoteNotificationReceived(notificationReceivedEvent)
7676

77-
if(notificationReceivedEvent.isPreventDefault) {
77+
if (notificationReceivedEvent.isPreventDefault) {
7878
// wait on display waiter. If the caller calls `display` on the notification,
7979
// we will exit `waitForWake` and set `wantsToDisplay` to true. If the callback
8080
// never calls `display` we will timeout and never set `wantsToDisplay` to true.
@@ -84,7 +84,7 @@ internal class NotificationGenerationProcessor(
8484
}
8585
}.join()
8686
}
87-
} catch(to: TimeoutCancellationException) {
87+
} catch (to: TimeoutCancellationException) {
8888
Logging.error("remoteNotificationReceived timed out, continuing with wantsToDisplay=$wantsToDisplay.", to)
8989
} catch (t: Throwable) {
9090
Logging.error("remoteNotificationReceived threw an exception. Displaying normal OneSignal notification.", t)
@@ -105,7 +105,7 @@ internal class NotificationGenerationProcessor(
105105
GlobalScope.launch(Dispatchers.IO) {
106106
_lifecycleService.externalNotificationWillShowInForeground(notificationWillDisplayEvent)
107107

108-
if(notificationWillDisplayEvent.isPreventDefault) {
108+
if (notificationWillDisplayEvent.isPreventDefault) {
109109
// wait on display waiter. If the caller calls `display` on the notification,
110110
// we will exit `waitForWake` and set `wantsToDisplay` to true. If the callback
111111
// never calls `display` we will timeout and never set `wantsToDisplay` to true.
@@ -115,7 +115,7 @@ internal class NotificationGenerationProcessor(
115115
}
116116
}.join()
117117
}
118-
} catch(to: TimeoutCancellationException) {
118+
} catch (to: TimeoutCancellationException) {
119119
Logging.error("notificationWillShowInForegroundHandler timed out, continuing with wantsToDisplay=$wantsToDisplay.", to)
120120
} catch (t: Throwable) {
121121
Logging.error("notificationWillShowInForegroundHandler threw an exception. Displaying normal OneSignal notification.", t)

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/INotificationLifecycleService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package com.onesignal.notifications.internal.lifecycle
22

33
import android.app.Activity
44
import com.onesignal.notifications.INotificationClickListener
5-
import com.onesignal.notifications.INotificationReceivedEvent
65
import com.onesignal.notifications.INotificationLifecycleListener
7-
import com.onesignal.notifications.INotificationWillDisplayEvent
6+
import com.onesignal.notifications.INotificationReceivedEvent
87
import com.onesignal.notifications.INotificationServiceExtension
8+
import com.onesignal.notifications.INotificationWillDisplayEvent
99
import com.onesignal.notifications.internal.common.NotificationGenerationJob
1010
import org.json.JSONArray
1111
import org.json.JSONObject

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/impl/NotificationLifecycleService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import com.onesignal.core.internal.application.IApplicationService
99
import com.onesignal.core.internal.time.ITime
1010
import com.onesignal.debug.internal.logging.Logging
1111
import com.onesignal.notifications.INotificationClickListener
12-
import com.onesignal.notifications.INotificationReceivedEvent
1312
import com.onesignal.notifications.INotificationLifecycleListener
14-
import com.onesignal.notifications.INotificationWillDisplayEvent
13+
import com.onesignal.notifications.INotificationReceivedEvent
1514
import com.onesignal.notifications.INotificationServiceExtension
15+
import com.onesignal.notifications.INotificationWillDisplayEvent
1616
import com.onesignal.notifications.internal.common.NotificationConstants
1717
import com.onesignal.notifications.internal.common.NotificationGenerationJob
1818
import com.onesignal.notifications.internal.common.NotificationHelper

‎OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/summary/impl/NotificationSummaryManager.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.onesignal.notifications.internal.summary.impl
33
import com.onesignal.core.internal.application.IApplicationService
44
import com.onesignal.core.internal.config.ConfigModelStore
55
import com.onesignal.core.internal.time.ITime
6-
import com.onesignal.notifications.internal.Notification
76
import com.onesignal.notifications.internal.common.NotificationGenerationJob
87
import com.onesignal.notifications.internal.common.NotificationHelper
98
import com.onesignal.notifications.internal.data.INotificationRepository

‎OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/internal/summary/NotificationSummaryManagerTests.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class NotificationSummaryManagerTests : FunSpec({
4747
mockSummaryNotificationDisplayer,
4848
MockHelper.configModelStore(),
4949
mockNotificationRestoreProcessor,
50-
MockHelper.time(111)
50+
MockHelper.time(111),
5151
)
5252

5353
/* When */
@@ -73,7 +73,7 @@ class NotificationSummaryManagerTests : FunSpec({
7373
mockSummaryNotificationDisplayer,
7474
MockHelper.configModelStore(),
7575
mockNotificationRestoreProcessor,
76-
MockHelper.time(111)
76+
MockHelper.time(111),
7777
)
7878

7979
/* When */
@@ -107,7 +107,7 @@ class NotificationSummaryManagerTests : FunSpec({
107107
mockSummaryNotificationDisplayer,
108108
MockHelper.configModelStore(),
109109
mockNotificationRestoreProcessor,
110-
MockHelper.time(111)
110+
MockHelper.time(111),
111111
)
112112

113113
/* When */
@@ -138,7 +138,7 @@ class NotificationSummaryManagerTests : FunSpec({
138138
mockSummaryNotificationDisplayer,
139139
MockHelper.configModelStore(),
140140
mockNotificationRestoreProcessor,
141-
MockHelper.time(111)
141+
MockHelper.time(111),
142142
)
143143

144144
/* When */
@@ -174,7 +174,7 @@ class NotificationSummaryManagerTests : FunSpec({
174174
mockSummaryNotificationDisplayer,
175175
MockHelper.configModelStore(),
176176
mockNotificationRestoreProcessor,
177-
MockHelper.time(111)
177+
MockHelper.time(111),
178178
)
179179

180180
/* When */
@@ -201,7 +201,7 @@ class NotificationSummaryManagerTests : FunSpec({
201201
mockSummaryNotificationDisplayer,
202202
mockConfig,
203203
mockNotificationRestoreProcessor,
204-
MockHelper.time(111)
204+
MockHelper.time(111),
205205
)
206206

207207
/* When */

0 commit comments

Comments
 (0)