Master origin (#43)

* Revert "* Content id in audio event field VC set to "6" for media type "tts""

This reverts commit 7b3984a.

* Revert "Changelog for Release 1.6.6"

This reverts commit a553ab4.

CHANGELOG.md

@@ -1,11 +1,3 @@
-1.6.5 Release notes (2024-11-07)
-================================
-
-### Changes
-
-* Content id in audio event field VC set to "6" for media type "tts"
-* Unit test updated
-
 1.6.4 Release notes (2024-11-04)
 ================================
 

Example/RingPublishingTracking.xcodeproj/project.pbxproj

@@ -179,7 +179,6 @@
 		A04E950A2CB92D870048B4AF /* AudioMetadata+AudioEventParameter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04E95092CB92D870048B4AF /* AudioMetadata+AudioEventParameter.swift */; };
 		A0A52C432C873E0600748DCB /* ContentMarkAsPaid.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A52C422C873E0600748DCB /* ContentMarkAsPaid.swift */; };
 		A0A52C452C88867900748DCB /* ContentMetadata+Parameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A52C442C88867900748DCB /* ContentMetadata+Parameters.swift */; };
-		A0EBEFA02CDCFCF4000629DF /* String+UUID.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0EBEF9F2CDCFCF4000629DF /* String+UUID.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -374,7 +373,6 @@
 		A04E95092CB92D870048B4AF /* AudioMetadata+AudioEventParameter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AudioMetadata+AudioEventParameter.swift"; sourceTree = "<group>"; };
 		A0A52C422C873E0600748DCB /* ContentMarkAsPaid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentMarkAsPaid.swift; sourceTree = "<group>"; };
 		A0A52C442C88867900748DCB /* ContentMetadata+Parameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ContentMetadata+Parameters.swift"; sourceTree = "<group>"; };
-		A0EBEF9F2CDCFCF4000629DF /* String+UUID.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+UUID.swift"; sourceTree = "<group>"; };
 		BF2945259492AA544792B04F /* Pods_RingPublishingTracking_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RingPublishingTracking_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		ED067BC36C6C6FA35D9F88B6 /* Pods_RingPublishingTrackingTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RingPublishingTrackingTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -709,7 +707,6 @@
 				60108E4E2B0515C6005656C1 /* VideoVisibility+ParameterName.swift */,
 				60108E4F2B0515C6005656C1 /* VideoEvent+VE.swift */,
 				60108E502B0515C6005656C1 /* String+MD5.swift */,
-				A0EBEF9F2CDCFCF4000629DF /* String+UUID.swift */,
 				60108E512B0515C6005656C1 /* VideoStartMode+ParameterName.swift */,
 				60108E522B0515C6005656C1 /* VideoAdsConfiguration+ParameterName.swift */,
 				60108E532B0515C6005656C1 /* VideoStreamFormat+ParameterName.swift */,
@@ -1218,7 +1215,6 @@
 				60108ED22B0515C6005656C1 /* EventsQueueManagerDelegate.swift in Sources */,
 				60108E9F2B0515C6005656C1 /* ArtemisRequest.swift in Sources */,
 				60108E892B0515C6005656C1 /* Logger.swift in Sources */,
-				A0EBEFA02CDCFCF4000629DF /* String+UUID.swift in Sources */,
 				60108EAA2B0515C6005656C1 /* Artemis.swift in Sources */,
 				60108EA22B0515C6005656C1 /* APIService.swift in Sources */,
 				60108EA62B0515C6005656C1 /* Profile.swift in Sources */,
@@ -1427,7 +1423,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.6;
+				MARKETING_VERSION = 1.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.RingPublishingTracking-Example.RingPublishingTracking";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1451,7 +1447,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.6;
+				MARKETING_VERSION = 1.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.RingPublishingTracking-Example.RingPublishingTracking";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Example/RingPublishingTracking/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.6</string>
+	<string>1.6.5</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

RingPublishingTracking.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = "RingPublishingTracking"
-    s.version      = "1.6.6"
+    s.version      = "1.6.5"
 
     s.summary      = "SDK used to report events from mobile application"
     s.license      = { :type => 'Copyright. Ringier Axel Springer Polska', :file => 'LICENSE' }

Sources/RingPublishingTracking/Private/EventsFactory+Audio.swift

@@ -60,12 +60,7 @@ private extension EventsFactory {
     }
 
     func createAudioEventVCParameter(metadata: AudioMetadata, audioState: AudioState) -> String {
-        var contentId = metadata.contentId
-        if metadata.mediaType.lowercased() == "tts" {
-            contentId = "6" // TTS contant for contentId
-        }
-
-        return "audio:\(contentId),\(contentId),\(metadata.audioStreamFormat.rawValue),\(audioState.currentBitrate)"
+        "audio:\(metadata.contentId),\(metadata.contentId),\(metadata.audioStreamFormat.rawValue),\(audioState.currentBitrate)"
     }
 
     func audioEventSessionTimestamp(for contentId: String, audioEvent: AudioEvent) -> String {

Tests/RingPublishingTrackingTests/AudioEventsTests.swift

@@ -132,7 +132,7 @@ class AudioEventsFactoryTest: XCTestCase {
 
         XCTAssertEqual(event.eventParameters["VE"] as? String, audioEvent.rawValue)
         XCTAssertEqual(event.eventParameters["RT"] as? String, EventType.videoEvent.rawValue)
-        XCTAssertEqual(event.eventParameters["PMU"] as? String, sampleAudioMetadata.contentId.uuidValidation())
+        XCTAssertEqual(event.eventParameters["PMU"] as? String, sampleAudioMetadata.contentId)
         XCTAssertEqual(event.eventParameters["VT"] as? Int, sampleAudioMetadata.audioDuration)
         XCTAssertEqual(event.eventParameters["VP"] as? Int, sampleAudioState.currentTime)
         XCTAssertEqual(event.eventParameters["VC"] as? String, sampleData)