Skip to content

Commit

Permalink
Merge pull request #605 from adobe/staging
Browse files Browse the repository at this point in the history 
staging -> main (core v2.6.2)
  • Loading branch information
@yangyansong-adbe
yangyansong-adbe authored Jan 26, 2024
2 parents f0c8d91 + 26b266a commit 74fe097
Show file tree
Hide file tree
Showing 9 changed files with 213 additions and 22 deletions.
2 changes: 1 addition & 1 deletion code/core/src/main/java/com/adobe/marketing/mobile/internal/CoreConstants.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package com.adobe.marketing.mobile.internal

internal object CoreConstants {
const val LOG_TAG = "MobileCore"
const val VERSION = "2.6.1"
const val VERSION = "2.6.2"

object EventDataKeys {
/**
Expand Down
9 changes: 8 additions & 1 deletion ...c/main/java/com/adobe/marketing/mobile/internal/eventhub/history/AndroidEventHistory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ public void run() {
* matching events in the {@code EventHistoryDatabase} if an "any" search was done. If an
* "ordered" search was done, the handler will contain a "1" if the event history requests
* were found in the order specified in the eventHistoryRequests array and a "0" if the
* events were not found in the order specified.
* events were not found in the order specified. In case of a database failure, the handler
* will receive a "-1" regardless of the enforceOrder flag.
*/
@Override
public void getEvents(
Expand Down Expand Up @@ -113,6 +114,12 @@ public void run() {
final Cursor result =
androidEventHistoryDatabase.select(eventHash, from, to);

// if the database operation failed, return -1
if (result == null) {
notifyHandler(handler, -1);
return;
}

int currentResult = 0;
try {
// columns are index 0: count, index 1: oldest, index 2:
Expand Down
21 changes: 13 additions & 8 deletions ...ore/src/main/java/com/adobe/marketing/mobile/launch/rulesengine/LaunchRulesConsequence.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,24 +151,29 @@ internal class LaunchRulesConsequence(
return RuleConsequence(consequence.id, consequence.type, tokenReplacedMap)
}

private fun replaceToken(value: Any?, tokenFinder: TokenFinder): Any? {
return when (value) {
is String -> replaceToken(value, tokenFinder)
is Map<*, *> -> replaceToken(EventDataUtils.castFromGenericType(value), tokenFinder)
is List<*> -> replaceToken(value, tokenFinder)
else -> value
}
}

private fun replaceToken(detail: Map<String, Any?>?, tokenFinder: TokenFinder): Map<String, Any?>? {
if (detail.isNullOrEmpty()) {
return null
}
val mutableDetail = detail.toMutableMap()
for ((key, value) in detail) {
when (value) {
is String -> mutableDetail[key] = replaceToken(value, tokenFinder)
is Map<*, *> -> mutableDetail[key] = replaceToken(
EventDataUtils.castFromGenericType(value),
tokenFinder
)
else -> continue
}
mutableDetail[key] = replaceToken(value, tokenFinder)
}
return mutableDetail
}

private fun replaceToken(value: List<Any?>, tokenFinder: TokenFinder): List<Any?> {
return value.map { replaceToken(it, tokenFinder) }
}
private fun replaceToken(value: String, tokenFinder: TokenFinder): String {
val template = Template(value, DelimiterPair(LAUNCH_RULE_TOKEN_LEFT_DELIMITER, LAUNCH_RULE_TOKEN_RIGHT_DELIMITER))
return template.render(tokenFinder, LaunchRuleTransformer.createTransforming())
Expand Down
22 changes: 13 additions & 9 deletions code/core/src/phone/java/com/adobe/marketing/mobile/MobileCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,19 @@ public static void setApplication(@NonNull final Application application) {
return;
}

// AMSDK-8502
// Workaround to prevent a crash happening on Android 8.0/8.1 related to TimeZoneNamesImpl
// https://issuetracker.google.com/issues/110848122
try {
new Date().toString();
} catch (AssertionError e) {
// Workaround for a bug in Android that can cause crashes on Android 8.0 and 8.1
} catch (Exception e) {
// Workaround for a bug in Android that can cause crashes on Android 8.0 and 8.1
if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.O
|| android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.O_MR1) {
// AMSDK-8502
// Workaround to prevent a crash happening on Android 8.0/8.1 related to
// TimeZoneNamesImpl
// https://issuetracker.google.com/issues/110848122
try {
new Date().toString();
} catch (AssertionError e) {
// Workaround for a bug in Android that can cause crashes on Android 8.0 and 8.1
} catch (Exception e) {
// Workaround for a bug in Android that can cause crashes on Android 8.0 and 8.1
}
}

ServiceProvider.getInstance().getAppContextService().setApplication(application);
Expand Down
2 changes: 1 addition & 1 deletion code/core/src/test/java/com/adobe/marketing/mobile/MobileCoreTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import kotlin.test.assertTrue
@RunWith(MockitoJUnitRunner.Silent::class)
class MobileCoreTests {

private var EXTENSION_VERSION = "2.6.1"
private var EXTENSION_VERSION = "2.6.2"

@Mock
private lateinit var mockedEventHub: EventHub
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/com/adobe/marketing/mobile/internal/configuration/ConfigurationExtensionTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import kotlin.test.assertTrue
@RunWith(MockitoJUnitRunner.Silent::class)
class ConfigurationExtensionTests {

private var EXTENSION_VERSION = "2.6.1"
private var EXTENSION_VERSION = "2.6.2"

@Mock
private lateinit var mockServiceProvider: ServiceProvider
Expand Down
74 changes: 74 additions & 0 deletions ...rc/test/java/com/adobe/marketing/mobile/launch/rulesengine/LaunchRulesConsequenceTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import org.mockito.kotlin.reset
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
import kotlin.test.assertNull
import kotlin.test.assertTrue

@RunWith(MockitoJUnitRunner.Silent::class)
class LaunchRulesConsequenceTests {
Expand Down Expand Up @@ -118,6 +119,79 @@ class LaunchRulesConsequenceTests {
assertEquals("", attachedData["launches"])
}

@Test
fun `Test Attach Data Array`() {
// / Given: a launch rule to attach data to event

// ---------- attach data rule ----------
// "eventdata": {
// "attached_data_array": [
// "{%~state.com.adobe.module.lifecycle/lifecyclecontextdata.carriername%}",
// "testStringTopLevel",
// {
// "testDictKey": "testVal",
// "osversionNested": "{%~state.com.adobe.module.lifecycle/lifecyclecontextdata.osversion%}"
// "numbers": 123
//
// }, [
// "{%~state.com.adobe.module.lifecycle/lifecyclecontextdata.osversion%}",
// "testStringInsideNestedArray"
// ]
// ]
// }
// --------------------------------------
resetRulesEngine("rules_module_tests/consequence_rules_testAttachData_array.json")

// / When: evaluating a launch event

// ------------ launch event ------------
// "eventdata": {
// "lifecyclecontextdata": {
// "launchevent": "LaunchEvent"
// }
// }
// --------------------------------------
`when`(extensionApi.getSharedState(anyString(), any(), anyBoolean(), any())).thenReturn(
SharedStateResult(
SharedStateStatus.SET,
mapOf(
"lifecyclecontextdata" to mapOf(
"carriername" to "AT&T",
"osversion" to "27"
)
)
)
)

val matchedRules = rulesEngine.evaluate(LaunchTokenFinder(defaultEvent, extensionApi))
val processedEvent =
launchRulesConsequence.process(defaultEvent, matchedRules)

// / Then: no consequence event will be dispatched
verify(extensionApi, never()).dispatch(any())

val attachedDataArray = processedEvent.eventData?.get("attached_data_array") as List<*>

// / Then: "{%~state.com.adobe.module.lifecycle/lifecyclecontextdata.carriername%}" should be replaced with "AT&T"
assertEquals("AT&T", attachedDataArray[0])

// / Then: "testStringTopLevel" should not be changed
assertEquals("testStringTopLevel", attachedDataArray[1])

// / Then: the nested map should be handled correctly
val nestedMap = attachedDataArray[2] as Map<*, *>

assertEquals("testVal", nestedMap["testDictKey"] as String)
assertEquals("27", nestedMap["osversionNested"] as String)
assertTrue { nestedMap["number"] is Int }
assertEquals(123, nestedMap["number"] as Int)

// / Then: the data array should be handled correctly
val dataArray = attachedDataArray[3] as List<*>
assertEquals("27", dataArray[0] as String)
assertEquals("testStringInsideNestedArray", dataArray[1] as String)
}

@Test
fun `Test Attach Data Invalid Json`() {
// / Given: a launch rule to attach data to event
Expand Down
101 changes: 101 additions & 0 deletions code/core/src/test/resources/rules_module_tests/consequence_rules_testAttachData_array.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"version": 1,
"rules": [
{
"condition": {
"type": "group",
"definition": {
"logic": "and",
"conditions": [
{
"type": "group",
"definition": {
"logic": "or",
"conditions": [
{
"type": "group",
"definition": {
"logic": "and",
"conditions": [
{
"type": "matcher",
"definition": {
"key": "~type",
"matcher": "eq",
"values": [
"com.adobe.eventType.lifecycle"
]
}
},
{
"type": "matcher",
"definition": {
"key": "~source",
"matcher": "eq",
"values": [
"com.adobe.eventSource.responseContent"
]
}
},
{
"type": "matcher",
"definition": {
"key": "lifecyclecontextdata.launchevent",
"matcher": "ex",
"values": []
}
}
]
}
}
]
}
},
{
"type": "group",
"definition": {
"logic": "and",
"conditions": [
{
"type": "matcher",
"definition": {
"key": "~state.com.adobe.module.lifecycle/lifecyclecontextdata.carriername",
"matcher": "eq",
"values": [
"AT&T"
]
}
}
]
}
}
]
}
},
"consequences": [
{
"id": "RCa839e401f54a459a9049328f9b609a07",
"type": "add",
"detail": {
"eventdata": {
"attached_data_array": [
"{%~state.com.adobe.module.lifecycle/lifecyclecontextdata.carriername%}",
"testStringTopLevel",
{
"testDictKey": "testVal",
"osversionNested": "{%~state.com.adobe.module.lifecycle/lifecyclecontextdata.osversion%}",
"number": 123
}, [
"{%~state.com.adobe.module.lifecycle/lifecyclecontextdata.osversion%}",
"testStringInsideNestedArray",
null
],
null
]
}
}
}
]
}
]
}
2 changes: 1 addition & 1 deletion code/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android.useAndroidX=true
#
#Maven artifacts
#Core extension
coreExtensionVersion=2.6.1
coreExtensionVersion=2.6.2
coreExtensionName=core
coreExtensionAARName=core-phone-release.aar
coreMavenRepoName=AdobeMobileCoreSdk
Expand Down

0 comments on commit 74fe097

Please sign in to comment.