Skip to content

Commit c9adb7b

Browse files
fix Lint issue
1 parent 703bb2a commit c9adb7b

5 files changed

Lines changed: 144 additions & 99 deletions

File tree

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ repositories {
4343

4444
android {
4545
namespace 'com.mparticle.kits.singular'
46+
buildFeatures {
47+
buildConfig = true
48+
}
4649
defaultConfig {
4750
minSdkVersion 16
4851
}

src/main/kotlin/com/mparticle/kits/SingularKit.kt

Lines changed: 98 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,17 @@ import org.json.JSONException
3030
import org.json.JSONObject
3131
import java.math.BigDecimal
3232

33-
open class SingularKit : KitIntegration(), ActivityListener, EventListener,
34-
PushListener, CommerceListener, ApplicationStateListener, UserAttributeListener,
33+
open class SingularKit :
34+
KitIntegration(),
35+
ActivityListener,
36+
EventListener,
37+
PushListener,
38+
CommerceListener,
39+
ApplicationStateListener,
40+
UserAttributeListener,
3541
AttributeListener {
36-
3742
interface DeviceAttributionCallback : SingularDeviceAttributionHandler
43+
3844
interface SdidAccessorHandler : SDIDAccessorHandler
3945

4046
private val logger = SingularLog.getLogger(Singular::class.java.simpleName)
@@ -45,7 +51,7 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
4551
//region Kit Integration Implementation
4652
override fun onKitCreate(
4753
settings: Map<String, String>,
48-
context: Context
54+
context: Context,
4955
): List<ReportingMessage> {
5056
// Returning the reporting message to state that the method was successful and
5157
// Preventing from the mParticle Kit to retry to activate to method.
@@ -54,14 +60,15 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
5460
ReportingMessage(
5561
this,
5662
ReportingMessage.MessageType.APP_STATE_TRANSITION,
57-
System.currentTimeMillis(), null
58-
)
63+
System.currentTimeMillis(),
64+
null,
65+
),
5966
)
6067
return messages
6168
}
6269

63-
fun buildSingularConfig(settings: Map<String, String>?): SingularConfig? {
64-
return try {
70+
fun buildSingularConfig(settings: Map<String, String>?): SingularConfig? =
71+
try {
6572
val singularKey = settings?.get(API_KEY)
6673
val singularSecret = settings?.get(API_SECRET)
6774

@@ -90,12 +97,14 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
9097
linkParams.put(PASSTHROUGH, singularLinkParams.passthrough)
9198
linkParams.put(IS_DEFERRED, singularLinkParams.isDeferred)
9299
if (singularLinkParams.urlParameters != null) {
93-
linkParams.put(QUERY_PARAMS,
100+
linkParams.put(
101+
QUERY_PARAMS,
94102
(singularLinkParams.urlParameters as Map<*, *>?)?.let {
95103
JSONObject(
96-
it
104+
it,
97105
)
98-
})
106+
},
107+
)
99108
}
100109
attributionResult.parameters = linkParams
101110
} catch (e: JSONException) {
@@ -111,23 +120,20 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
111120
config.withLogLevel(Log.DEBUG)
112121
}
113122

114-
config.deviceAttributionHandler = deviceAttributionCallback;
123+
config.deviceAttributionHandler = deviceAttributionCallback
115124

116-
config.withCustomSdid(customSdid, sdidAccessorHandler);
125+
config.withCustomSdid(customSdid, sdidAccessorHandler)
117126

118127
Singular.setWrapperNameAndVersion(MPARTICLE_WRAPPER_NAME, MPARTICLE_WRAPPER_VERSION)
119128
config
120129
} catch (ex: Exception) {
121130
logger.error(CANT_BUILD_SINGULAR_CONFIG_MESSAGE, ex)
122131
null
123132
}
124-
}
125133

126134
override fun setOptOut(b: Boolean): List<ReportingMessage> = emptyList()
127135

128-
override fun getName(): String {
129-
return KIT_NAME
130-
}
136+
override fun getName(): String = KIT_NAME
131137

132138
override fun setInstallReferrer(intent: Intent) {}
133139

@@ -144,7 +150,10 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
144150
}
145151

146152
//region Unimplemented (Empty Methods)
147-
override fun onActivityCreated(activity: Activity, bundle: Bundle?): List<ReportingMessage> {
153+
override fun onActivityCreated(
154+
activity: Activity,
155+
bundle: Bundle?,
156+
): List<ReportingMessage> {
148157
initializeSingular()
149158
return emptyList()
150159
}
@@ -155,12 +164,11 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
155164

156165
override fun onActivitySaveInstanceState(
157166
activity: Activity,
158-
bundle: Bundle?
167+
bundle: Bundle?,
159168
): List<ReportingMessage> = emptyList()
160169

161170
override fun onActivityDestroyed(activity: Activity): List<ReportingMessage> = emptyList()
162171

163-
164172
//endregion
165173
//endregion
166174
//region Event Listener Implementation
@@ -171,11 +179,12 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
171179
val eventInfo = mpEvent.customAttributes
172180

173181
// Logging the event with the Singular API
174-
val eventStatus: Boolean = if (!eventInfo.isNullOrEmpty()) {
175-
Singular.eventJSON(eventName, JSONObject(eventInfo))
176-
} else {
177-
Singular.event(eventName)
178-
}
182+
val eventStatus: Boolean =
183+
if (!eventInfo.isNullOrEmpty()) {
184+
Singular.eventJSON(eventName, JSONObject(eventInfo))
185+
} else {
186+
Singular.event(eventName)
187+
}
179188

180189
// If the Singular event logging was successful, return the message to the mParticle Kit
181190
// So it won't retry the event
@@ -189,22 +198,29 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
189198
//region Unimplemented (Empty Methods)
190199
override fun leaveBreadcrumb(s: String): List<ReportingMessage> = emptyList()
191200

192-
193-
override fun logError(s: String, map: Map<String, String>): List<ReportingMessage> = emptyList()
201+
override fun logError(
202+
s: String,
203+
map: Map<String, String>,
204+
): List<ReportingMessage> = emptyList()
194205

195206
override fun logException(
196207
e: Exception,
197208
map: Map<String, String>,
198-
s: String
209+
s: String,
199210
): List<ReportingMessage> = emptyList()
200211

201-
override fun logScreen(s: String, map: Map<String, String>): List<ReportingMessage> =
202-
emptyList()
212+
override fun logScreen(
213+
s: String,
214+
map: Map<String, String>,
215+
): List<ReportingMessage> = emptyList()
203216

204217
//endregion
205218
//endregion
206219
//region Push Listener Implementation
207-
override fun onPushRegistration(deviceToken: String, senderId: String): Boolean {
220+
override fun onPushRegistration(
221+
deviceToken: String,
222+
senderId: String,
223+
): Boolean {
208224
// Saving the registration token to determine when the user uninstalls the app.
209225
this.deviceToken = deviceToken
210226
executeIfSingularInitialized({
@@ -218,7 +234,7 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
218234
private fun executeIfSingularInitialized(
219235
operation: () -> Unit,
220236
forceInitSingular: Boolean = false,
221-
operationName: String
237+
operationName: String,
222238
) {
223239
if (isInitialized) {
224240
operation.invoke()
@@ -251,7 +267,10 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
251267
//region Unimplemented (Empty Methods)
252268
override fun willHandlePushMessage(intent: Intent): Boolean = false
253269

254-
override fun onPushMessageReceived(context: Context, intent: Intent) {}
270+
override fun onPushMessageReceived(
271+
context: Context,
272+
intent: Intent,
273+
) {}
255274

256275
//endregion
257276
//endregion
@@ -279,7 +298,7 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
279298
product.name,
280299
product.category,
281300
product.quantity.toInt(),
282-
product.unitPrice
301+
product.unitPrice,
283302
)
284303
}
285304
}
@@ -313,13 +332,16 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
313332
bigDecimal: BigDecimal,
314333
bigDecimal1: BigDecimal,
315334
s: String,
316-
map: Map<String, String>
335+
map: Map<String, String>,
317336
): List<ReportingMessage> = emptyList()
318337

319338
//endregion
320339
//endregion
321340
//region Deprecated Attribute Listener
322-
override fun setUserAttribute(key: String, value: String) {
341+
override fun setUserAttribute(
342+
key: String,
343+
value: String,
344+
) {
323345
// TODO: Debug these lines to understand the code
324346
val map = HashMap<String?, String?>()
325347
if (MParticle.UserAttributes.AGE == key) {
@@ -335,64 +357,80 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
335357
executeIfSingularInitialized(
336358
{
337359
Singular.eventJSON("UserAttribute", (map as Map<*, *>?)?.let { JSONObject(it) })
338-
}, forceInitSingular = false, "setUserAttribute"
360+
},
361+
forceInitSingular = false,
362+
"setUserAttribute",
339363
)
340364
}
341365
}
342366

343-
override fun setUserAttributeList(s: String, list: List<String>) {}
367+
override fun setUserAttributeList(
368+
s: String,
369+
list: List<String>,
370+
) {}
344371

345372
override fun onIncrementUserAttribute(
346373
key: String?,
347374
incrementedBy: Number?,
348375
value: String?,
349-
user: FilteredMParticleUser?
376+
user: FilteredMParticleUser?,
350377
) {
351378
}
352379

380+
override fun onRemoveUserAttribute(
381+
s: String,
382+
filteredMParticleUser: FilteredMParticleUser,
383+
) {}
353384

354-
override fun onRemoveUserAttribute(s: String, filteredMParticleUser: FilteredMParticleUser) {}
355385
override fun onSetUserAttribute(
356386
s: String,
357387
o: Any,
358-
filteredMParticleUser: FilteredMParticleUser
388+
filteredMParticleUser: FilteredMParticleUser,
359389
) {
360390
}
361391

362-
override fun onSetUserTag(s: String, filteredMParticleUser: FilteredMParticleUser) {}
392+
override fun onSetUserTag(
393+
s: String,
394+
filteredMParticleUser: FilteredMParticleUser,
395+
) {}
396+
363397
override fun onSetUserAttributeList(
364398
s: String,
365399
list: List<String>,
366-
filteredMParticleUser: FilteredMParticleUser
400+
filteredMParticleUser: FilteredMParticleUser,
367401
) {
368402
}
369403

370404
override fun onSetAllUserAttributes(
371405
map: Map<String, String>,
372406
map1: Map<String, List<String>>,
373-
filteredMParticleUser: FilteredMParticleUser
407+
filteredMParticleUser: FilteredMParticleUser,
374408
) {
375409
}
376410

377-
override fun supportsAttributeLists(): Boolean {
378-
return false
379-
}
411+
override fun supportsAttributeLists(): Boolean = false
380412

381413
override fun onConsentStateUpdated(
382414
consentState: ConsentState,
383415
consentState1: ConsentState,
384-
filteredMParticleUser: FilteredMParticleUser
416+
filteredMParticleUser: FilteredMParticleUser,
385417
) {
386-
387418
executeIfSingularInitialized({
388419
consentState.ccpaConsentState?.let { Singular.limitDataSharing(it.isConsented) }
389420
}, forceInitSingular = false, "onConsentStateUpdated")
390-
391421
}
392422

393-
override fun setAllUserAttributes(map: Map<String, String>, map1: Map<String, List<String>>) {}
423+
override fun setAllUserAttributes(
424+
map: Map<String, String>,
425+
map1: Map<String, List<String>>,
426+
) {}
427+
394428
override fun removeUserAttribute(s: String) {}
395-
override fun setUserIdentity(identityType: IdentityType, s: String) {
429+
430+
override fun setUserIdentity(
431+
identityType: IdentityType,
432+
s: String,
433+
) {
396434
if (identityType == IdentityType.CustomerId) {
397435
executeIfSingularInitialized({
398436
Singular.setCustomUserId(s)
@@ -450,18 +488,20 @@ open class SingularKit : KitIntegration(), ActivityListener, EventListener,
450488
"Can't build Singular Config in the mParticle Kit"
451489
private var singularSettings: Map<String, String>? = null
452490

453-
private var deviceAttributionCallback: DeviceAttributionCallback? = null;
454-
private var customSdid: String? = null;
455-
private var sdidAccessorHandler: SdidAccessorHandler? = null;
491+
private var deviceAttributionCallback: DeviceAttributionCallback? = null
492+
private var customSdid: String? = null
493+
private var sdidAccessorHandler: SdidAccessorHandler? = null
456494

457495
@JvmStatic fun setDeviceAttributionCallback(deviceAttributionCallback: DeviceAttributionCallback?) {
458-
this.deviceAttributionCallback = deviceAttributionCallback;
496+
this.deviceAttributionCallback = deviceAttributionCallback
459497
}
460498

461-
@JvmStatic fun setCustomSDID(customSDID: String?, sdidAccessorHandler: SdidAccessorHandler?) {
499+
@JvmStatic fun setCustomSDID(
500+
customSDID: String?,
501+
sdidAccessorHandler: SdidAccessorHandler?,
502+
) {
462503
this.customSdid = customSDID
463504
this.sdidAccessorHandler = sdidAccessorHandler
464505
}
465-
466506
}
467507
}

0 commit comments

Comments
 (0)