Merge branch 'release/6.0.3'

snowplow · Apr 19, 2024 · 07536ea · 07536ea
2 parents c1be49c + 26d2ce3
commit 07536ea
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 67 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 6.0.3 (2024-04-18)
+--------------------------
+Add Subject config flag to avoid WindowManager bug (#657)
+Catch more generic exceptions for InstallReferrer (#647)
+
 Version 6.0.2 (2024-02-28)
 --------------------------
 Fix createTracker call hanging for 10 seconds if run on a background thread (#620)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.0.2
+6.0.3
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ plugins {
 
 subprojects {
     group = 'com.snowplowanalytics'
-    version = '6.0.2'
+    version = '6.0.3'
     repositories {
         google()
         maven {

diff --git a/gradle.properties b/gradle.properties
@@ -31,7 +31,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 SONATYPE_STAGING_PROFILE=comsnowplowanalytics
 GROUP=com.snowplowanalytics
 POM_ARTIFACT_ID=snowplow-android-tracker
-VERSION_NAME=6.0.2
+VERSION_NAME=6.0.3
 
 POM_NAME=snowplow-android-tracker
 POM_PACKAGING=aar

diff --git a/.../src/androidTest/java/com/snowplowanalytics/snowplow/event/ApplicationInstallEventTest.kt b/.../src/androidTest/java/com/snowplowanalytics/snowplow/event/ApplicationInstallEventTest.kt
@@ -49,7 +49,7 @@ class ApplicationInstallEventTest {
             .installAutotracking(true)
         createTracker(listOf(trackerConfiguration, plugin))
 
-        Thread.sleep(1000)
+        Thread.sleep(1500)
 
         // check if event was tracked
         Assert.assertTrue(eventTracked)
@@ -67,7 +67,7 @@ class ApplicationInstallEventTest {
             .installAutotracking(true)
         createTracker(listOf(trackerConfiguration, plugin))
 
-        Thread.sleep(1000)
+        Thread.sleep(1500)
 
         // check if event was tracked
         Assert.assertTrue(eventTracked)
@@ -78,7 +78,7 @@ class ApplicationInstallEventTest {
         // create tracker again
         createTracker(listOf(trackerConfiguration, plugin))
 
-        Thread.sleep(1000)
+        Thread.sleep(1500)
 
         // check if event was tracked
         Assert.assertFalse(eventTracked)

diff --git a/...-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/media/TestMediaController.kt b/...-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/media/TestMediaController.kt
@@ -87,7 +87,7 @@ class TestMediaController {
         )
         media?.track(MediaPlayEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(1, trackedEvents.size)
         assertEquals(eventSchema("play"), firstEvent.schema)
@@ -102,7 +102,7 @@ class TestMediaController {
         )
         media?.track(MediaEndEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(1, trackedEvents.size)
         assertEquals(eventSchema("end"), firstEvent.schema)
@@ -119,7 +119,7 @@ class TestMediaController {
         media?.track(event = MediaSeekEndEvent(), player = MediaPlayerEntity(currentTime = 2.0))
         media?.track(event = MediaSeekStartEvent(), player = MediaPlayerEntity(currentTime = 3.0))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(3, trackedEvents.size)
         assertEquals(2, trackedEvents.filter { it.schema == eventSchema("seek_start") }.size)
@@ -136,7 +136,7 @@ class TestMediaController {
         media?.track(MediaPlayEvent())
         media?.track(MediaPauseEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(1, trackedEvents.size)
         assertEquals(eventSchema("play"), firstEvent.schema)
@@ -154,7 +154,7 @@ class TestMediaController {
 
         media?.track(MediaPlayEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(1, trackedEvents.size)
         assertNotNull(
@@ -178,7 +178,7 @@ class TestMediaController {
                 )
         )
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(1, trackedEvents.size)
         assertNotNull(
@@ -199,7 +199,7 @@ class TestMediaController {
         media?.track(MediaPlaybackRateChangeEvent(newRate = 1.5))
         media?.track(MediaPauseEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(2, trackedEvents.size)
         val rateEvent = trackedEvents.find { it.schema == eventSchema("playback_rate_change") }
@@ -238,7 +238,7 @@ class TestMediaController {
 
         media?.track(MediaFullscreenChangeEvent(fullscreen = true))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(true, firstEvent.payload.get("fullscreen"))
         assertEquals(true, firstPlayer?.get("fullscreen"))
@@ -253,7 +253,7 @@ class TestMediaController {
 
         media?.track(MediaPictureInPictureChangeEvent(pictureInPicture = true))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(true, firstEvent.payload.get("pictureInPicture"))
         assertEquals(true, firstPlayer?.get("pictureInPicture"))
@@ -265,7 +265,7 @@ class TestMediaController {
 
         media?.track(MediaAdFirstQuartileEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(25, firstEvent.payload.get("percentProgress"))
     }
@@ -276,7 +276,7 @@ class TestMediaController {
 
         media?.track(MediaAdMidpointEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(50, firstEvent.payload.get("percentProgress"))
     }
@@ -287,7 +287,7 @@ class TestMediaController {
 
         media?.track(MediaAdThirdQuartileEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(75, firstEvent.payload.get("percentProgress"))
     }
@@ -301,7 +301,7 @@ class TestMediaController {
         media?.track(MediaAdResumeEvent(percentProgress = 40))
         media?.track(MediaAdPauseEvent(percentProgress = 50))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         val adClickEvent = trackedEvents.find { it.schema == eventSchema("ad_click") }
         assertEquals(15, adClickEvent?.payload?.get("percentProgress"))
@@ -326,7 +326,7 @@ class TestMediaController {
             framesPerSecond = 60
         ))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals("720p", firstEvent.payload.get("previousQuality"))
         assertEquals("1080p", firstEvent.payload.get("newQuality"))
@@ -344,7 +344,7 @@ class TestMediaController {
             errorDescription = "Failed to load media"
         ))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals("501", firstEvent.payload.get("errorCode"))
         assertEquals("forbidden", firstEvent.payload.get("errorName"))
@@ -363,7 +363,7 @@ class TestMediaController {
             mapOf("url" to "https://www.youtube.com/watch?v=12345")
         ))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals("iglu:com.acme/video_played/jsonschema/1-0-0", firstEvent.schema)
         assertEquals("Video", firstPlayer?.get("label"))
@@ -377,7 +377,7 @@ class TestMediaController {
 
         media?.track(MediaPlayEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals("media1", firstSession?.get("mediaSessionId"))
     }
@@ -401,7 +401,7 @@ class TestMediaController {
         media.update(player = MediaPlayerEntity(currentTime = 10.0))
         media.track(MediaEndEvent())
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         val endEvent = trackedEvents.find { it.schema == eventSchema("end") }
         val lastSession = endEvent?.entities?.find { it.map.get("schema") == sessionSchema }?.map?.get("data") as? Map<*, *>
@@ -427,7 +427,7 @@ class TestMediaController {
 
         timer.fire()
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(1, trackedEvents.size)
         assertEquals(10000L, timer.delay)
@@ -452,7 +452,7 @@ class TestMediaController {
         media.track(MediaPauseEvent())
         timer.fire()
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(4, trackedEvents.size)
     }
@@ -475,7 +475,7 @@ class TestMediaController {
             timer.fire()
         }
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(2, trackedEvents.size)
     }
@@ -498,7 +498,7 @@ class TestMediaController {
             timer.fire()
         }
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(5, trackedEvents.size)
     }
@@ -519,7 +519,7 @@ class TestMediaController {
             media?.update(player = MediaPlayerEntity(currentTime = i.toDouble()))
         }
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(4, trackedEvents.size)
         assertEquals(3, trackedEvents.filter { it.schema == eventSchema("percent_progress") }.size)
@@ -539,7 +539,7 @@ class TestMediaController {
             media?.update(player = MediaPlayerEntity(currentTime = i.toDouble()))
         }
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(2, trackedEvents.size)
 
@@ -562,7 +562,7 @@ class TestMediaController {
             media?.update(player = MediaPlayerEntity(currentTime = i.toDouble()))
         }
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(1, trackedEvents.size)
     }
@@ -586,7 +586,7 @@ class TestMediaController {
             media?.update(player = MediaPlayerEntity(currentTime = i.toDouble()))
         }
 
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         assertEquals(5, trackedEvents.size)
         assertEquals(3, trackedEvents.filter { it.schema == eventSchema("percent_progress") }.size)

diff --git a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/PluginsTest.kt b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/PluginsTest.kt
@@ -62,7 +62,7 @@ class PluginsTest {
         val tracker = createTracker(listOf(plugin, testPlugin))
         tracker.track(Structured("cat", "act"))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
         Assert.assertTrue(expectation)
     }
 
@@ -84,7 +84,7 @@ class PluginsTest {
         val tracker = createTracker(listOf(plugin1, plugin2, testPlugin))
         tracker.track(ScreenView("sv"))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
         Assert.assertTrue(expectation)
     }
 
@@ -112,7 +112,7 @@ class PluginsTest {
         tracker.track(SelfDescribing("schema1", emptyMap()))
         tracker.track(SelfDescribing("schema2", emptyMap()))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
         Assert.assertTrue(event1HasEntity!!)
         Assert.assertFalse(event2HasEntity!!)
     }
@@ -135,7 +135,7 @@ class PluginsTest {
         tracker.track(SelfDescribing("schema2", emptyMap()))
         tracker.track(Structured("cat", "act"))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
         Assert.assertTrue(event1Called)
         Assert.assertFalse(event2Called)
         Assert.assertFalse(event3Called)
@@ -156,7 +156,7 @@ class PluginsTest {
         tracker.track(SelfDescribing("schema1", emptyMap()))
         tracker.track(Structured("cat", "act"))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
         Assert.assertTrue(structuredCalled)
         Assert.assertFalse(selfDescribingCalled)
     }
@@ -172,7 +172,7 @@ class PluginsTest {
 
         tracker.track(ScreenView("sv"))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
         Assert.assertTrue(expectation)
     }
 
@@ -187,7 +187,7 @@ class PluginsTest {
 
         tracker.track(ScreenView("sv"))
 
-        Thread.sleep(100)
+        Thread.sleep(200)
         Assert.assertFalse(pluginCalled)
     }
 
@@ -203,12 +203,12 @@ class PluginsTest {
         val tracker = createTracker(listOf(filterPlugin, afterTrackPlugin))
 
         tracker.track(SelfDescribing("s1", emptyMap()))
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         Assert.assertFalse(afterTrackCalled)
 
         tracker.track(SelfDescribing("s2", emptyMap()))
-        Thread.sleep(100)
+        Thread.sleep(200)
 
         Assert.assertTrue(afterTrackCalled)
     }

diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/core/tracker/InstallReferrerDetails.kt b/snowplow-tracker/src/main/java/com/snowplowanalytics/core/tracker/InstallReferrerDetails.kt
@@ -75,6 +75,9 @@ class InstallReferrerDetails(
                             } catch (_: RemoteException) {
                                 Logger.d(TAG, "Install referrer API remote exception.")
                                 callback(null)
+                            } catch (_: NoSuchMethodError) {
+                                Logger.d(TAG, "Upgrade InstallReferrer package to v1.1 or higher to add the install referrer details entity.")
+                                callback(null)
                             }
                         }
                         InstallReferrerResponse.FEATURE_NOT_SUPPORTED -> {
@@ -99,7 +102,7 @@ class InstallReferrerDetails(
             })
         }
 
-        fun isInstallReferrerPackageAvailable(): Boolean {
+        private fun isInstallReferrerPackageAvailable(): Boolean {
             try {
                 Class.forName("com.android.installreferrer.api.InstallReferrerStateListener")
                 return true