Merge branch 'refs/heads/dev' into SUITEDEV-35599-MultiID-for-predict

emartech · Sep 25, 2024 · 35f1464 · 35f1464
2 parents 1fdff70 + 5b27a08
commit 35f1464
Show file tree

Hide file tree

Showing 33 changed files with 586 additions and 886 deletions.
diff --git a/core/src/main/java/com/emarsys/core/util/AndroidVersionUtils.kt b/core/src/main/java/com/emarsys/core/util/AndroidVersionUtils.kt
@@ -22,7 +22,11 @@ object AndroidVersionUtils {
         @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.TIRAMISU)
         get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
 
-    val isUOrAbove: Boolean
+    val isSOrAbove: Boolean
+        @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S)
+        get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
+   val isUOrAbove: Boolean
         @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
         get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
 

diff --git a/emarsys-sdk/src/main/AndroidManifest.xml b/emarsys-sdk/src/main/AndroidManifest.xml
@@ -9,6 +9,14 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name="com.emarsys.mobileengage.geofence.GeofenceBroadcastReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.emarsys.sdk.GEOFENCE_ACTION" />
+            </intent-filter>
+        </receiver>
         <activity
             android:name="com.emarsys.NotificationOpenedActivity"
             android:exported="false"

diff --git a/emarsys-sdk/src/main/java/com/emarsys/di/DefaultEmarsysComponent.kt b/emarsys-sdk/src/main/java/com/emarsys/di/DefaultEmarsysComponent.kt
@@ -869,7 +869,6 @@ open class DefaultEmarsysComponent(config: EmarsysConfig) : EmarsysComponent {
             fusedLocationProviderClient,
             GeofenceFilter(GEOFENCE_LIMIT),
             LocationServices.getGeofencingClient(config.application),
-            config.application,
             geofenceActionCommandFactory,
             geofenceCacheableEventHandler,
             BooleanStorage(MobileEngageStorageKey.GEOFENCE_ENABLED, sharedPreferences),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -45,7 +45,6 @@ hms_push = "6.12.0.300"
 googleServices = "4.4.2"
 google-play-services-location = "21.3.0"
 google-play-services-auth = "20.7.0"
-google-accompanist-swipetorefresh = "0.34.0"
 webkit = "1.11.0"
 mockito-android = "5.10.0"
 mockito-core = "5.10.0"
@@ -90,7 +89,6 @@ google-play-services-location = { module = "com.google.android.gms:play-services
 google-play-services-auth = { module = "androidx.core:core-ktx", version.ref = "google-play-services-auth" }
 google-firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging", version.ref = "fcm" }
 google-firebase-common = { group = "com.google.firebase", name = "firebase-common", version.ref = "firebase-common" }
-google-accompanist-swipetorefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "google-accompanist-swipetorefresh" }
 google-gson = { module = "com.google.code.gson:gson", version.ref = "google-gson" }
 huawei-hms-push = { group = "com.huawei.hms", name = "push", version.ref = "hms_push" }
 huawei-agconnect-core = { group = "com.huawei.agconnect", name = "agconnect-core", version.ref = "agconnect_core" }