Skip to content

Commit 3f724c7

Browse files
committed
Run ktlint -F across repo
1 parent aef894c commit 3f724c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+375
-334
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/ADMMessageHandlerJob.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ class ADMMessageHandlerJob : ADMMessageHandlerJobBase() {
4949

5050
PushRegistratorADM.fireCallback(null)
5151
}
52-
}
52+
}

OneSignalSDK/onesignal/src/main/java/com/onesignal/AlertDialogPrepromptForAndroidSettings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object AlertDialogPrepromptForAndroidSettings {
4141
activity: Activity,
4242
titlePrefix: String,
4343
previouslyDeniedPostfix: String,
44-
callback: Callback,
44+
callback: Callback
4545
) {
4646
val titleTemplate = activity.getString(R.string.permission_not_available_title)
4747
val title = titleTemplate.format(titlePrefix)

OneSignalSDK/onesignal/src/main/java/com/onesignal/BackgroundRunnable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ internal open class BackgroundRunnable : Runnable {
66
override fun run() {
77
Thread.currentThread().priority = Process.THREAD_PRIORITY_BACKGROUND
88
}
9-
}
9+
}

OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class GenerateNotificationOpenIntent(
3030
context.packageManager.getLaunchIntentForPackage(
3131
context.packageName
3232
)
33-
?: return null
33+
?: return null
3434

3535
// Removing "package" from the intent treats the app as if it was started externally.
3636
// - This is exactly what an Android Launcher does.

OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotificationOpenIntentFromPushPayload.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object GenerateNotificationOpenIntentFromPushPayload {
1717
): GenerateNotificationOpenIntent {
1818
val behavior = OSNotificationOpenBehaviorFromPushPayload(
1919
context,
20-
fcmPayload,
20+
fcmPayload
2121
)
2222

2323
return GenerateNotificationOpenIntent(
@@ -34,9 +34,9 @@ object GenerateNotificationOpenIntentFromPushPayload {
3434
}
3535

3636
private fun openBrowserIntent(
37-
uri: Uri?,
37+
uri: Uri?
3838
): Intent? {
3939
if (uri == null) return null
4040
return OSUtils.openURLInBrowserIntent(uri)
4141
}
42-
}
42+
}

OneSignalSDK/onesignal/src/main/java/com/onesignal/IntentGeneratorForAttachingToNotifications.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ class IntentGeneratorForAttachingToNotifications(
1212
private val notificationOpenedClassAndroid22AndOlder: Class<*> = NotificationOpenedReceiverAndroid22AndOlder::class.java
1313

1414
fun getNewBaseIntent(
15-
notificationId: Int,
15+
notificationId: Int
1616
): Intent {
1717
val intent =
18-
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
18+
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
1919
getNewBaseIntentAndroidAPI23Plus()
20-
else
20+
} else {
2121
getNewBaseIntentAndroidAPI22AndOlder()
22+
}
2223

2324
return intent
2425
.putExtra(
@@ -29,7 +30,7 @@ class IntentGeneratorForAttachingToNotifications(
2930
// tracking Activity instance around.
3031
.addFlags(
3132
Intent.FLAG_ACTIVITY_SINGLE_TOP or
32-
Intent.FLAG_ACTIVITY_CLEAR_TOP
33+
Intent.FLAG_ACTIVITY_CLEAR_TOP
3334
)
3435
}
3536

@@ -50,17 +51,17 @@ class IntentGeneratorForAttachingToNotifications(
5051
)
5152
intent.addFlags(
5253
Intent.FLAG_ACTIVITY_NEW_TASK or
53-
Intent.FLAG_ACTIVITY_MULTIPLE_TASK or
54-
Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
54+
Intent.FLAG_ACTIVITY_MULTIPLE_TASK or
55+
Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
5556
)
5657
return intent
5758
}
5859

5960
fun getNewActionPendingIntent(
6061
requestCode: Int,
61-
oneSignalIntent: Intent,
62+
oneSignalIntent: Intent
6263
): PendingIntent? {
63-
val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
64+
val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
6465
return PendingIntent.getActivity(
6566
context,
6667
requestCode,

OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationPermissionController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object LocationPermissionController : PermissionsActivity.PermissionCallback {
3636

3737
fun prompt(
3838
fallbackToSettings: Boolean,
39-
androidPermissionString: String,
39+
androidPermissionString: String
4040
) {
4141
PermissionsActivity.startPrompt(
4242
fallbackToSettings,

OneSignalSDK/onesignal/src/main/java/com/onesignal/NavigateToAndroidSettingsForNotifications.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object NavigateToAndroidSettingsForNotifications {
3636
intent.action = "android.settings.APP_NOTIFICATION_SETTINGS"
3737
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
3838

39-
//for Android 5-7
39+
// for Android 5-7
4040
intent.putExtra("app_package", context.getPackageName())
4141
intent.putExtra("app_uid", context.getApplicationInfo().uid)
4242

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationOpenedReceiverBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ abstract class NotificationOpenedReceiverBase : Activity() {
4242
NotificationOpenedProcessor.processFromContext(this, getIntent())
4343
finish()
4444
}
45-
}
45+
}

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object NotificationPermissionController : PermissionsActivity.PermissionCallback
3535
private const val ANDROID_PERMISSION_STRING = "android.permission.POST_NOTIFICATIONS"
3636

3737
private val callbacks:
38-
MutableSet<OneSignal.PromptForPushNotificationPermissionResponseHandler> = HashSet()
38+
MutableSet<OneSignal.PromptForPushNotificationPermissionResponseHandler> = HashSet()
3939
private var awaitingForReturnFromSystemSettings = false
4040

4141
init {
@@ -45,11 +45,11 @@ object NotificationPermissionController : PermissionsActivity.PermissionCallback
4545
@ChecksSdkIntAtLeast(api = 33)
4646
val supportsNativePrompt =
4747
Build.VERSION.SDK_INT > 32 &&
48-
OSUtils.getTargetSdkVersion(OneSignal.appContext) > 32
48+
OSUtils.getTargetSdkVersion(OneSignal.appContext) > 32
4949

5050
fun prompt(
5151
fallbackToSettings: Boolean,
52-
callback: OneSignal.PromptForPushNotificationPermissionResponseHandler?,
52+
callback: OneSignal.PromptForPushNotificationPermissionResponseHandler?
5353
) {
5454
if (callback != null) callbacks.add(callback)
5555

@@ -59,10 +59,11 @@ object NotificationPermissionController : PermissionsActivity.PermissionCallback
5959
}
6060

6161
if (!supportsNativePrompt) {
62-
if (fallbackToSettings)
62+
if (fallbackToSettings) {
6363
showFallbackAlertDialog()
64-
else
64+
} else {
6565
fireCallBacks(false)
66+
}
6667
return
6768
}
6869

@@ -81,10 +82,11 @@ object NotificationPermissionController : PermissionsActivity.PermissionCallback
8182

8283
override fun onReject(fallbackToSettings: Boolean) {
8384
val fallbackShown =
84-
if (fallbackToSettings)
85+
if (fallbackToSettings) {
8586
showFallbackAlertDialog()
86-
else
87+
} else {
8788
false
89+
}
8890
if (!fallbackShown) fireCallBacks(false)
8991
}
9092

0 commit comments

Comments
 (0)