Skip to content

Commit f7078b3

Browse files
authored
Merge pull request #564 from code-payments/release/2.1.12
release 2.1.12
2 parents 746a90c + 4bf9bf7 commit f7078b3

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

app/src/main/java/com/getcode/manager/AuthManager.kt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import com.getcode.db.InMemoryDao
1111
import com.getcode.model.AirdropType
1212
import com.getcode.model.PrefsBool
1313
import com.getcode.model.PrefsString
14+
import com.getcode.model.description
15+
import com.getcode.model.uuid
1416
import com.getcode.network.BalanceController
1517
import com.getcode.network.ChatHistoryController
1618
import com.getcode.network.exchange.Exchange
@@ -26,13 +28,15 @@ import com.getcode.util.AccountUtils
2628
import com.getcode.utils.ErrorUtils
2729
import com.getcode.utils.TraceType
2830
import com.getcode.utils.installationId
31+
import com.getcode.utils.makeE164
2932
import com.getcode.utils.trace
3033
import com.getcode.utils.token
3134
import com.google.firebase.Firebase
3235
import com.google.firebase.installations.installations
3336
import com.google.firebase.messaging.FirebaseMessaging
3437
import com.google.firebase.messaging.messaging
3538
import com.ionspin.kotlin.crypto.LibsodiumInitializer
39+
import com.mixpanel.android.mpmetrics.MixpanelAPI
3640
import dagger.hilt.android.qualifiers.ApplicationContext
3741
import io.reactivex.rxjava3.core.Completable
3842
import io.reactivex.rxjava3.core.Single
@@ -59,6 +63,7 @@ class AuthManager @Inject constructor(
5963
private val inMemoryDao: InMemoryDao,
6064
private val analytics: AnalyticsService,
6165
private val mnemonicManager: MnemonicManager,
66+
private val mixpanelAPI: MixpanelAPI
6267
) : CoroutineScope by CoroutineScope(Dispatchers.IO) {
6368
private var softLoginDisabled: Boolean = false
6469

@@ -265,9 +270,21 @@ class AuthManager @Inject constructor(
265270
}
266271
.doOnSuccess {
267272
taggedTrace("account data fetched successfully")
273+
274+
val distinctId = user?.userId?.description
275+
val phoneNumber = phone?.phoneNumber?.makeE164()
276+
268277
if (!BuildConfig.DEBUG) {
278+
// BugSnag
269279
if (Bugsnag.isStarted()) {
270-
Bugsnag.setUser(null, phone?.phoneNumber, null)
280+
Bugsnag.setUser(distinctId, phoneNumber, null)
281+
}
282+
283+
// Mixpanel
284+
mixpanelAPI.identify(distinctId)
285+
286+
if (phone?.phoneNumber != null) {
287+
mixpanelAPI.people.set("\$email", phoneNumber)
271288
}
272289
}
273290
launch { savePrefs(phone!!, user!!) }

app/src/main/java/com/kik/kikx/kikcodes/KikCodeScanner.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ sealed class ScanQuality(val headerValue: Int) {
1111
data object Best : ScanQuality(10)
1212

1313
companion object {
14-
private val values = listOf(Low, Medium, High, Best)
15-
16-
fun iterator(): Iterator<ScanQuality> {
17-
return values.iterator()
14+
fun iterator(): List<ScanQuality> {
15+
return listOf(Low, Medium, High, Best)
1816
}
1917
}
2018
}

buildSrc/src/main/java/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object Android {
1212
object Packaging {
1313
private const val majorVersion = 2
1414
private const val minorVersion = 1
15-
private const val patchVersion = 11
15+
private const val patchVersion = 12
1616

1717
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
1818
}

0 commit comments

Comments
 (0)