Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions android-core/src/main/java/com/mparticle/MParticle.java
Original file line number Diff line number Diff line change
Expand Up @@ -1892,6 +1892,7 @@ public void selectPlacements(@NonNull String viewName,
config);
}
}

public void selectPlacements(@NonNull String viewName,
@NonNull Map<String, String> attributes) {
if (mConfigManager.isEnabled()) {
Expand All @@ -1904,6 +1905,12 @@ public void selectPlacements(@NonNull String viewName,
);
}
}

public void purchaseFinalized(@NonNull String placementId, @NonNull String catalogItemId, boolean status) {
if (mConfigManager.isEnabled()) {
mKitManager.purchaseFinalized(placementId, catalogItemId, status);
}
}
}
/**
* @hidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.net.Uri;
import android.os.Bundle;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;

Expand Down Expand Up @@ -666,6 +667,13 @@ public void execute(String viewName,
}
}

@Override
public void purchaseFinalized(@NonNull String placementId, @NonNull String catalogItemId, boolean status) {
if (mKitManager != null) {
mKitManager.purchaseFinalized(placementId, catalogItemId, status);
}
}

static class CoreCallbacksImpl implements CoreCallbacks {
KitFrameworkWrapper mKitFrameworkWrapper;
ConfigManager mConfigManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ void execute(String viewName,
Map<String, WeakReference<Typeface>> fontTypefaces,
RoktConfig config);

void purchaseFinalized(@NonNull String placementId, @NonNull String catalogItemId, boolean status);

enum KitStatus {
NOT_CONFIGURED,
STOPPED,
Expand Down
26 changes: 25 additions & 1 deletion android-core/src/test/kotlin/com/mparticle/MParticleTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import org.mockito.ArgumentCaptor
import org.mockito.ArgumentMatchers
import org.mockito.ArgumentMatchers.any
import org.mockito.Mockito
import org.mockito.Mockito.mock
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.Mockito.`when`
Expand Down Expand Up @@ -531,6 +530,31 @@ class MParticleTest {
verify(instance.mKitManager, never()).execute(any(), any(), any(), any(), any(), any())
}

@Test
fun testReportConversion_withBasicParams_whenEnabled() {
var instance: MParticle = InnerMockMParticle()
MParticle.setInstance(instance)
`when`(instance.mConfigManager.isEnabled()).thenReturn(true)

val attributes = mutableMapOf<String, String>()
attributes.put("a", "b")

instance.rokt.purchaseFinalized("132", "1111", true)

verify(instance.mKitManager).purchaseFinalized("132", "1111", true)
}

@Test
fun testReportConversion_withBasicParams_whenDisabled() {
var instance: MParticle = InnerMockMParticle()
MParticle.setInstance(instance)
`when`(instance.mConfigManager.isEnabled()).thenReturn(false)

instance.rokt.purchaseFinalized("132", "1111", true)

verify(instance.mKitManager, never()).purchaseFinalized("132", "1111", true)
}

inner class InnerMockMParticle : MParticle() {
init {
mConfigManager = ConfigManager(MockContext())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -620,5 +620,7 @@ void execute(String viewName,
Map<String, WeakReference<Typeface>> fontTypefaces,
FilteredMParticleUser user,
RoktConfig config);

void purchaseFinalized(@NonNull String placementId, @NonNull String catalogItemId, boolean status);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1401,6 +1401,19 @@ public void execute(String viewName,
}
}

@Override
public void purchaseFinalized(@NonNull String placementId, @NonNull String catalogItemId, boolean status) {
for (KitIntegration provider : providers.values()) {
try {
if (provider instanceof KitIntegration.RoktListener && !provider.isDisabled()) {
((KitIntegration.RoktListener) provider).purchaseFinalized(placementId,catalogItemId,status);
}
} catch (Exception e) {
Logger.warning("Failed to call purchaseFinalized for kit: " + provider.getName() + ": " + e.getMessage());
}
}
}

private void confirmEmail(
@Nullable String email,
@Nullable MParticleUser user,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1451,6 +1451,10 @@ class KitManagerImplTest {
) {
println("Executed with $attributes")
}

override fun purchaseFinalized(placementId: String, catalogItemId: String, status: Boolean) {
println("purchaseFinalized with placementId: $placementId catalogItemId : $catalogItemId status : $status ")
}
}
internal inner class KitManagerEventCounter : MockKitManagerImpl() {
var logBaseEventCalled = 0
Expand Down
Loading