Skip to content

Commit 58991ac

Browse files
Fix Lint error
1 parent 905b2ba commit 58991ac

8 files changed

Lines changed: 69 additions & 44 deletions

File tree

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ apply plugin: 'com.mparticle.kit'
3636

3737
android {
3838
namespace 'com.mparticle.kits.tune'
39+
buildFeatures {
40+
buildConfig = true
41+
}
3942
defaultConfig {
4043
minSdkVersion 21
4144
}

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

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,39 @@
11
package com.mparticle.kits
22

33
import android.content.Context
4+
import com.mparticle.AttributionError
5+
import com.mparticle.AttributionResult
46
import com.mparticle.kits.KitIntegration
5-
import com.mparticle.kits.mobileapptracker.MATDeeplinkListener
67
import com.mparticle.kits.KitIntegration.ApplicationStateListener
7-
import com.mparticle.kits.mobileapptracker.MATDeferredDplinkr
8-
import java.util.concurrent.atomic.AtomicBoolean
8+
import com.mparticle.kits.KitUtils
99
import com.mparticle.kits.ReportingMessage
10-
import com.mparticle.kits.mobileapptracker.MATUtils
1110
import com.mparticle.kits.TuneKit
12-
import com.mparticle.kits.KitUtils
11+
import com.mparticle.kits.mobileapptracker.MATDeeplinkListener
12+
import com.mparticle.kits.mobileapptracker.MATDeferredDplinkr
1313
import com.mparticle.kits.mobileapptracker.MATUrlRequester
14-
import com.mparticle.AttributionResult
15-
import com.mparticle.AttributionError
14+
import com.mparticle.kits.mobileapptracker.MATUtils
15+
import java.util.concurrent.atomic.AtomicBoolean
1616

1717
/**
1818
* Tune Kit implementing Tune's post-install deep-link feature. Different from other Kits, the Tune Kit
1919
* does not actually wrap the full Tune SDK - only a small subset of classes required to query the Tune server
2020
* for deep links that match the given user.
2121
*/
22-
class TuneKit : KitIntegration(), MATDeeplinkListener, ApplicationStateListener {
22+
class TuneKit :
23+
KitIntegration(),
24+
MATDeeplinkListener,
25+
ApplicationStateListener {
2326
private var settingAdvertiserId: String? = null
2427
private var settingConversionKey: String? = null
2528
var packageName: String? = null
2629
private var deepLinker: MATDeferredDplinkr? = null
2730
private val listenerWaiting = AtomicBoolean(false)
31+
2832
override fun getName(): String = KIT_NAME
2933

3034
override fun onKitCreate(
3135
settings: Map<String, String>,
32-
context: Context
36+
context: Context,
3337
): List<ReportingMessage> {
3438
if (MATUtils.firstInstall(getContext())) {
3539
settingAdvertiserId = getSettings()[SETTING_ADVERTISER_ID]
@@ -38,11 +42,12 @@ class TuneKit : KitIntegration(), MATDeeplinkListener, ApplicationStateListener
3842
if (KitUtils.isEmpty(packageName)) {
3943
packageName = getContext().packageName
4044
}
41-
deepLinker = MATDeferredDplinkr.initialize(
42-
settingAdvertiserId,
43-
settingConversionKey,
44-
packageName
45-
)
45+
deepLinker =
46+
MATDeferredDplinkr.initialize(
47+
settingAdvertiserId,
48+
settingConversionKey,
49+
packageName,
50+
)
4651
deepLinker?.listener = this
4752
checkForAttribution()
4853
}
@@ -73,17 +78,19 @@ class TuneKit : KitIntegration(), MATDeeplinkListener, ApplicationStateListener
7378

7479
override fun didReceiveDeeplink(deeplink: String?) {
7580
listenerWaiting.set(false)
76-
val result = AttributionResult()
77-
.setLink(deeplink)
78-
.setServiceProviderId(configuration.kitId)
81+
val result =
82+
AttributionResult()
83+
.setLink(deeplink)
84+
.setServiceProviderId(configuration.kitId)
7985
kitManager.onResult(result)
8086
}
8187

8288
override fun didFailDeeplink(error: String?) {
8389
listenerWaiting.set(false)
84-
val deepLinkError = AttributionError()
85-
.setMessage(error)
86-
.setServiceProviderId(configuration.kitId)
90+
val deepLinkError =
91+
AttributionError()
92+
.setMessage(error)
93+
.setServiceProviderId(configuration.kitId)
8794
kitManager.onError(deepLinkError)
8895
}
8996

@@ -99,4 +106,4 @@ class TuneKit : KitIntegration(), MATDeeplinkListener, ApplicationStateListener
99106
private const val SETTING_PACKAGE_NAME_OVERRIDE = "overridePackageName"
100107
private const val KIT_NAME = "Tune"
101108
}
102-
}
109+
}

src/main/kotlin/com/mparticle/kits/mobileapptracker/MATConstants.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ object MATConstants {
1010

1111
// MAT Android SDK version number
1212
const val SDK_VERSION = "3.11.4"
13-
}
13+
}

src/main/kotlin/com/mparticle/kits/mobileapptracker/MATDeeplinkListener.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ package com.mparticle.kits.mobileapptracker
22

33
interface MATDeeplinkListener {
44
fun didReceiveDeeplink(deeplink: String?)
5+
56
fun didFailDeeplink(error: String?)
6-
}
7+
}

src/main/kotlin/com/mparticle/kits/mobileapptracker/MATDeferredDplinkr.kt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,28 @@ class MATDeferredDplinkr private constructor() {
1010
var conversionKey: String? = null
1111
var packageName: String? = null
1212
var googleAdvertisingId: String? = null
13-
private set
13+
private set
1414

1515
var googleAdTrackingLimited = 0
1616

1717
var androidId: String? = null
1818
var userAgent: String? = null
1919
var listener: MATDeeplinkListener? = null
2020

21-
22-
23-
fun setGoogleAdvertisingId(googleAdvertisingId: String?, isLATEnabled: Int) {
21+
fun setGoogleAdvertisingId(
22+
googleAdvertisingId: String?,
23+
isLATEnabled: Int,
24+
) {
2425
dplinkr?.googleAdvertisingId = googleAdvertisingId
2526
dplinkr?.googleAdTrackingLimited = isLATEnabled
2627
}
2728

28-
29-
30-
31-
fun checkForDeferredDeeplink(context: Context?, urlRequester: MATUrlRequester) {
32-
Thread { // If advertiser ID, conversion key, or package name were not set, return
29+
fun checkForDeferredDeeplink(
30+
context: Context?,
31+
urlRequester: MATUrlRequester,
32+
) {
33+
Thread {
34+
// If advertiser ID, conversion key, or package name were not set, return
3335
if (dplinkr?.advertiserId == null || dplinkr?.conversionKey == null || dplinkr?.packageName == null) {
3436
if (listener != null) {
3537
listener?.didFailDeeplink("Advertiser ID, conversion key, or package name not set")
@@ -58,11 +60,12 @@ class MATDeferredDplinkr private constructor() {
5860
companion object {
5961
@Volatile
6062
private var dplinkr: MATDeferredDplinkr? = null
63+
6164
@Synchronized
6265
fun initialize(
6366
advertiserId: String?,
6467
conversionKey: String?,
65-
packageName: String?
68+
packageName: String?,
6669
): MATDeferredDplinkr? {
6770
dplinkr = MATDeferredDplinkr()
6871
dplinkr?.advertiserId = advertiserId

src/main/kotlin/com/mparticle/kits/mobileapptracker/MATUrlRequester.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class MATUrlRequester {
1313

1414
// Construct deeplink endpoint url
1515
val uri = Uri.Builder()
16-
uri.scheme("https")
16+
uri
17+
.scheme("https")
1718
.authority(dplinkr.advertiserId + "." + MATConstants.DEEPLINK_DOMAIN)
1819
.appendPath("v1")
1920
.appendPath("link.txt")
@@ -23,13 +24,12 @@ class MATUrlRequester {
2324
.appendQueryParameter("package_name", dplinkr.packageName)
2425
.appendQueryParameter(
2526
"ad_id",
26-
if (dplinkr.googleAdvertisingId != null) dplinkr.googleAdvertisingId else dplinkr.androidId
27-
)
28-
.appendQueryParameter("user_agent", dplinkr.userAgent)
27+
if (dplinkr.googleAdvertisingId != null) dplinkr.googleAdvertisingId else dplinkr.androidId,
28+
).appendQueryParameter("user_agent", dplinkr.userAgent)
2929
if (dplinkr.googleAdvertisingId != null) {
3030
uri.appendQueryParameter(
3131
"google_ad_tracking_disabled",
32-
dplinkr.googleAdTrackingLimited.toString()
32+
dplinkr.googleAdTrackingLimited.toString(),
3333
)
3434
}
3535
try {

src/main/kotlin/com/mparticle/kits/mobileapptracker/MATUtils.kt

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ import android.webkit.WebSettings
99
import android.webkit.WebView
1010
import com.mparticle.kits.KitUtils
1111
import com.mparticle.kits.TuneKit
12-
import java.io.*
12+
import java.io.BufferedReader
13+
import java.io.IOException
14+
import java.io.InputStream
15+
import java.io.InputStreamReader
16+
import java.io.UnsupportedEncodingException
1317
import java.lang.ref.WeakReference
1418

1519
object MATUtils {
@@ -38,7 +42,10 @@ object MATUtils {
3842
/**
3943
* Determine the device's user agent and set the corresponding field.
4044
*/
41-
fun calculateUserAgent(context: Context?, tuneKit: TuneKit) {
45+
fun calculateUserAgent(
46+
context: Context?,
47+
tuneKit: TuneKit,
48+
) {
4249
val userAgent = System.getProperty("http.agent", "")
4350
if (!KitUtils.isEmpty(userAgent)) {
4451
tuneKit.setUserAgent(userAgent)
@@ -66,9 +73,13 @@ object MATUtils {
6673
* Runnable for getting the WebView user agent
6774
*/
6875
@SuppressLint("NewApi")
69-
private class GetWebViewUserAgent(context: Context?, tuneKit: TuneKit) : Runnable {
76+
private class GetWebViewUserAgent(
77+
context: Context?,
78+
tuneKit: TuneKit,
79+
) : Runnable {
7080
private val weakContext: WeakReference<Context?>
7181
private val tuneKit: TuneKit
82+
7283
override fun run() {
7384
try {
7485
Class.forName("android.os.AsyncTask") // prevents WebView from crashing on certain devices
@@ -93,4 +104,4 @@ object MATUtils {
93104
this.tuneKit = tuneKit
94105
}
95106
}
96-
}
107+
}

src/test/kotlin/com/mparticle/kits/TuneKitTest.kt renamed to src/test/kotlin/com/mparticle/kits/TuneKitTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.mockito.Mockito
88

99
class TuneKitTests {
1010
private val kit: KitIntegration
11-
get() = TuneKit()
11+
get() = TuneKit()
1212

1313
@Test
1414
@Throws(Exception::class)
@@ -50,4 +50,4 @@ class TuneKitTests {
5050
}
5151
Assert.fail("$className not found as a known integration.")
5252
}
53-
}
53+
}

0 commit comments

Comments
 (0)