Merge branch 'master' of github.com:maureenorea-clores/android-inappm…

…essaging into feat/SDKCF-6327_android-14-support

# Conflicts:
#	inappmessaging/USERGUIDE.md

.gitignore

@@ -90,3 +90,9 @@ fabric.properties
 *.iml
 modules.xml
 *.ipr
+
+# Gems
+.bundle/
+vendor/
+# Use latest gem versions
+Gemfile.lock

dependency_check_suppressions.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
   <!-- Robolectric -->
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
      file name: guava-27.0.1-jre.jar
      ]]></notes>
@@ -12,15 +12,15 @@
   </suppress>
 
   <!-- Dokka -->
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: kotlin-analysis-intellij-1.7.10.jar (shaded: com.google.code.gson:gson:2.8.8)
    ]]></notes>
     <packageUrl regex="true">^pkg:maven/com\.google\.code\.gson/gson@.*$</packageUrl>
     <cpe>cpe:/a:google:gson</cpe>
     <vulnerabilityName>CVE-2022-25647</vulnerabilityName>
   </suppress>
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: kotlin-analysis-intellij-1.7.10.jar (shaded: com.google.protobuf:protobuf-java:2.6.1)
    ]]></notes>
@@ -30,21 +30,21 @@
     <vulnerabilityName>CVE-2022-3171</vulnerabilityName>
     <vulnerabilityName>CVE-2022-3509</vulnerabilityName>
   </suppress>
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: woodstox-core-6.2.4.jar
    ]]></notes>
     <packageUrl regex="true">^pkg:maven/com\.fasterxml\.woodstox/woodstox\-core@.*$</packageUrl>
     <vulnerabilityName>CVE-2022-40152</vulnerabilityName>
   </suppress>
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: woodstox-core-6.2.4.jar (shaded: com.sun.xml.bind.jaxb:isorelax:20090621)
    ]]></notes>
     <packageUrl regex="true">^pkg:maven/com\.sun\.xml\.bind\.jaxb/isorelax@.*$</packageUrl>
     <cve>CVE-2023-34411</cve>
   </suppress>
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: jackson-databind-2.12.7.1.jar
    ]]></notes>
@@ -53,7 +53,7 @@
   </suppress>
 
   <!-- Detekt -->
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: snakeyaml-1.33.jar
    ]]></notes>
@@ -62,7 +62,7 @@
   </suppress>
 
   <!-- SDK Utils -->
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: play-services-basement-17.0.0.aar
    ]]></notes>
@@ -72,7 +72,7 @@
   </suppress>
 
   <!-- Retrofit -->
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: okhttp-3.14.9.jar
    ]]></notes>
@@ -81,7 +81,7 @@
     <cpe>cpe:/a:squareup:okhttp3</cpe>
     <vulnerabilityName>CVE-2021-0341</vulnerabilityName>
   </suppress>
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: okio-1.17.2.jar
    ]]></notes>
@@ -90,7 +90,7 @@
   </suppress>
 
   <!-- WorkManager -->
-  <suppress until="2023-12-31Z">
+  <suppress until="2024-06-30Z">
     <notes><![CDATA[
    file name: work-runtime-2.7.1.aar: inspector.jar (shaded: com.google.protobuf:protobuf-javalite:3.10.0)
    ]]></notes>

inappmessaging/USERGUIDE.md

@@ -487,7 +487,7 @@ Documents targeting Product Managers:
 * SDKCF-6327: Updated compile and target SDK to API 34 (Android 14).
   - As part of security updates, the use of implicit intents is restricted. If you plan to redirect users to internal app activity through a campaign's button action, make sure to mark the activity as `android:exported="true"`.
 
-### 7.5.0 (In-Progress)
+### 7.5.0 (2023-12-12)
 * SDKCF-6575: Added sending of device Id in all IAM requests.
 * Improved the following classes to increase code coverage:
   - InAppMessagingConstants (SDKCF-6497)

inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/AccountRepository.kt

@@ -52,6 +52,7 @@ internal abstract class AccountRepository {
         preferences: PreferencesUtil = PreferencesUtil,
     )
 
+    @SuppressWarnings("kotlin:S6515")
     companion object {
         private const val TOKEN_PREFIX = "OAuth2 "
         internal const val ID_TRACKING_ERR_MSG = "Both an access token and a user tracking id have been set. " +

inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/CampaignRepository.kt

@@ -38,6 +38,7 @@ internal abstract class CampaignRepository {
      */
     abstract fun clearMessages()
 
+    @SuppressWarnings("kotlin:S6515")
     companion object {
         private var instance: CampaignRepository = CampaignRepositoryImpl()
 

inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/HostAppInfoRepository.kt

@@ -93,6 +93,7 @@ internal interface HostAppInfoRepository {
      */
     fun getRegisteredActivity(): Activity?
 
+    @SuppressWarnings("kotlin:S6515")
     companion object {
         private const val TAG = "IAM_HostAppRepository"
         private var instance: HostAppInfoRepository = HostAppInfoRepositoryImpl()

inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/view/InAppMessagingTooltipView.kt

@@ -116,6 +116,7 @@ internal class InAppMessagingTooltipView(
 
     /** This method binds image to view. */
     @Suppress("ClickableViewAccessibility", "TooGenericExceptionCaught", "LongMethod")
+    @SuppressWarnings("kotlin:S6516")
     private fun bindImage() { // Display image.
         this.hide(asGone = true)
         if (this.imageUrl.isNullOrEmpty()) {

inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/ConfigScheduler.kt

@@ -21,6 +21,7 @@ internal interface ConfigScheduler {
 
     fun startConfig(delay: Long = 0, workManager: WorkManager? = null)
 
+    @SuppressWarnings("kotlin:S6515")
     companion object {
         private const val CONFIG_WORKER_NAME = "iam_config_worker"
         private var instance: ConfigScheduler = ConfigSchedulerImpl()

inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/EventMessageReconciliationScheduler.kt

@@ -22,6 +22,7 @@ internal interface EventMessageReconciliationScheduler {
      */
     fun startReconciliationWorker(workManager: WorkManager? = null, delay: Long = 0)
 
+    @SuppressWarnings("kotlin:S6515")
     companion object {
         private const val MESSAGES_EVENTS_WORKER_NAME = "iam_messages_events_worker"
         private var instance: EventMessageReconciliationScheduler = EventMessageReconciliationSchedulerImpl()

inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/MessageMixerPingScheduler.kt

@@ -27,6 +27,7 @@ internal interface MessageMixerPingScheduler {
      */
     fun pingMessageMixerService(initialDelay: Long, workManager: WorkManager? = null)
 
+    @SuppressWarnings("kotlin:S6515")
     companion object {
         private const val MESSAGE_MIXER_PING_WORKER = "iam_message_mixer_worker"
         private var instance: MessageMixerPingScheduler = MessageMixerPingSchedulerImpl()