Skip to content

Commit 7ff20f5

Browse files
Pass Identity api instance directly instead of full mPInstance
1 parent 5893f18 commit 7ff20f5

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@ public void execute(String viewName,
13431343
MParticle instance = MParticle.getInstance();
13441344
MParticleUser user = instance.Identity().getCurrentUser();
13451345
String email = attributes != null ? attributes.get("email") : null;
1346-
confirmEmail(email,user,instance, () -> {
1346+
confirmEmail(email,user,instance.Identity(), () -> {
13471347
JSONArray jsonArray = new JSONArray();
13481348

13491349
KitConfiguration kitConfig = provider.getConfiguration();
@@ -1386,7 +1386,7 @@ public void execute(String viewName,
13861386
private void confirmEmail(
13871387
@Nullable String email,
13881388
@Nullable MParticleUser user,
1389-
MParticle instance,
1389+
IdentityApi identityApi,
13901390
Runnable runnable
13911391
) {
13921392
if (email != null && user != null) {
@@ -1406,7 +1406,7 @@ private void confirmEmail(
14061406
IdentityApiRequest identityRequest = IdentityApiRequest.withUser(user)
14071407
.email(email)
14081408
.build();
1409-
MParticleTask<IdentityApiResult> task = instance.Identity().identify(identityRequest);
1409+
MParticleTask<IdentityApiResult> task = identityApi.identify(identityRequest);
14101410
task.addFailureListener(new TaskFailureListener() {
14111411
@Override
14121412
public void onFailure(IdentityHttpResponse result) {

android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,11 +1079,11 @@ class KitManagerImplTest {
10791079
"confirmEmail",
10801080
String::class.java,
10811081
MParticleUser::class.java,
1082-
MParticle::class.java,
1082+
IdentityApi::class.java,
10831083
Runnable::class.java
10841084
)
10851085
method.isAccessible = true
1086-
val result = method.invoke(manager, "Test@gmail.com", user, instance, runnable)
1086+
val result = method.invoke(manager, "Test@gmail.com", user, identityApi, runnable)
10871087
verify(mockTask).addSuccessListener(any())
10881088
}
10891089

@@ -1126,11 +1126,11 @@ class KitManagerImplTest {
11261126
"confirmEmail",
11271127
String::class.java,
11281128
MParticleUser::class.java,
1129-
MParticle::class.java,
1129+
IdentityApi::class.java,
11301130
Runnable::class.java
11311131
)
11321132
method.isAccessible = true
1133-
val result = method.invoke(manager, "Test@gmail.com", user, instance, runnable)
1133+
val result = method.invoke(manager, "Test@gmail.com", user, identityApi, runnable)
11341134
Mockito.verify(runnable).run()
11351135
}
11361136

@@ -1173,11 +1173,11 @@ class KitManagerImplTest {
11731173
"confirmEmail",
11741174
String::class.java,
11751175
MParticleUser::class.java,
1176-
MParticle::class.java,
1176+
IdentityApi::class.java,
11771177
Runnable::class.java
11781178
)
11791179
method.isAccessible = true
1180-
val result = method.invoke(manager, null, user, instance, runnable)
1180+
val result = method.invoke(manager, null, user, identityApi, runnable)
11811181
Mockito.verify(runnable).run()
11821182
}
11831183

@@ -1220,11 +1220,11 @@ class KitManagerImplTest {
12201220
"confirmEmail",
12211221
String::class.java,
12221222
MParticleUser::class.java,
1223-
MParticle::class.java,
1223+
IdentityApi::class.java,
12241224
Runnable::class.java
12251225
)
12261226
method.isAccessible = true
1227-
val result = method.invoke(manager, null, user, instance, runnable)
1227+
val result = method.invoke(manager, null, user, identityApi, runnable)
12281228
Mockito.verify(runnable).run()
12291229
}
12301230

0 commit comments

Comments
 (0)