chore: Fix warnings in SDK and debug app (#847)

Fix warning in SDK and debug app
primer-io · Apr 24, 2024 · 1c19ef9 · 1c19ef9
1 parent 93579c6
commit 1c19ef9
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/Debug App/Info.plist b/Debug App/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.primerapi.PrimerSDKExample</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Debug App/Primer.io Debug App.xcodeproj/project.pbxproj b/Debug App/Primer.io Debug App.xcodeproj/project.pbxproj
@@ -51,7 +51,7 @@
 		E1A2971F2B021ABA005ADA51 /* URL+NetworkHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AB44D12AFE13AF00639DC5 /* URL+NetworkHeaders.swift */; };
 		EA7FAA4F8476BD3711D628CB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B18D7E7738BF86467B0F1465 /* Images.xcassets */; };
 		F02F496FD20B5291C044F62C /* MerchantResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E3C8FE62D22147335F2455 /* MerchantResultViewController.swift */; };
-		F03699592AC2E63700E4179D /* BuildFile in Sources */ = {isa = PBXBuildFile; };
+		F03699592AC2E63700E4179D /* (null) in Sources */ = {isa = PBXBuildFile; };
 		F08F63D82B9B5A7C006EF9A9 /* SessionConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = F08F63D72B9B5A7C006EF9A9 /* SessionConfiguration.swift */; };
 		F08F63DA2B9B5BC5006EF9A9 /* AppetizeConfigProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F08F63D92B9B5BC5006EF9A9 /* AppetizeConfigProvider.swift */; };
 		F08F63DC2B9F27B0006EF9A9 /* MetadataParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F08F63DB2B9F27B0006EF9A9 /* MetadataParser.swift */; };
@@ -609,7 +609,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F03699592AC2E63700E4179D /* BuildFile in Sources */,
+				F03699592AC2E63700E4179D /* (null) in Sources */,
 				04F323612BD408C600F5927C /* AppetizeConfigTests.swift in Sources */,
 				04F323632BD408C600F5927C /* MetadataParserTests.swift in Sources */,
 			);
@@ -740,7 +740,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "";
+				PRODUCT_BUNDLE_IDENTIFIER = com.primerapi.PrimerSDKExample;
 				PRODUCT_NAME = "Debug App";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.primerapi.PrimerSDKExample";
@@ -775,7 +775,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "";
+				PRODUCT_BUNDLE_IDENTIFIER = com.primerapi.PrimerSDKExample;
 				PRODUCT_NAME = "Debug App";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.primerapi.PrimerSDKExample";

diff --git a/Debug App/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Debug App/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -55,6 +55,7 @@
       "size" : "60x60"
     },
     {
+      "filename" : "ItunesArtwork@2x 1.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

diff --git a/Debug App/Resources/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x 1.png b/Debug App/Resources/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x 1.png
diff --git a/Debug App/Sources/View Controllers/MerchantResultViewController.swift b/Debug App/Sources/View Controllers/MerchantResultViewController.swift
@@ -41,12 +41,8 @@ final class MerchantResultViewController: UIViewController {
 
         if logs.count > 0 {
             if let data = try? JSONSerialization.data(withJSONObject: logs) {
-                if let prettyNSStr = data.prettyPrintedJSONString {
-                    if let prettyStr = prettyNSStr as? String {
-                        logsTextView.text = prettyStr
-                    } else {
-                        logsTextView.text = "[\"Failed to case NSString to String [WebDriverIO]\"]"
-                    }
+                if let prettyNSStr = data.prettyPrintedJSONString as? String {
+                    logsTextView.text = prettyNSStr
                 } else {
                     logsTextView.text = "[\"Failed to create pretty string from logs\"]"
                 }
@@ -59,12 +55,8 @@ final class MerchantResultViewController: UIViewController {
 
         if let checkoutData {
             if let data = try? JSONEncoder().encode(checkoutData) {
-                if let prettyNSStr = data.prettyPrintedJSONString {
-                    if let prettyStr = prettyNSStr as? String {
-                        responseTextView.text = prettyStr
-                    } else {
-                        responseTextView.text = "[\"Failed to case NSString to String [WebDriverIO]\"]"
-                    }
+                if let prettyNSStr = data.prettyPrintedJSONString as? String {
+                    responseTextView.text = prettyNSStr
                 } else {
                     responseTextView.text = "[\"Failed to create pretty string from checkout data\"]"
                 }

diff --git a/Sources/PrimerSDK/Classes/Core/3DS/3DSService.swift b/Sources/PrimerSDK/Classes/Core/3DS/3DSService.swift
@@ -282,8 +282,8 @@ class ThreeDSService: ThreeDSServiceProtocol, LogReporter {
 
             // ⚠️  Property version doesn't exist on version before 1.1.0, so PrimerSDK won't build
             //     if Primer3DS is not equal or above 1.1.0
-            if Primer3DS.hardcodedVersion.compareWithVersion("1.1.1") == .orderedDescending ||
-                Primer3DS.hardcodedVersion.compareWithVersion("1.1.1") == .orderedSame {
+            if Primer3DS.version.compareWithVersion("1.1.1") == .orderedDescending ||
+                Primer3DS.version.compareWithVersion("1.1.1") == .orderedSame {
                 do {
                     primer3DS.is3DSSanityCheckEnabled = PrimerSettings.current.debugOptions.is3DSSanityCheckEnabled
                     try primer3DS.initializeSDK(apiKey: apiKey, certificates: certs)

diff --git a/Sources/PrimerSDK/Classes/Error Handler/PrimerKlarnaError+Extension.swift b/Sources/PrimerSDK/Classes/Error Handler/PrimerKlarnaError+Extension.swift
@@ -23,6 +23,7 @@ extension PrimerKlarnaError: PrimerErrorProtocol {
              .klarnaSdkError(_, let userInfo):
             tmpUserInfo = tmpUserInfo.merging(userInfo ?? [:]) { (_, new) in new }
             tmpUserInfo["diagnosticsId"] = self.diagnosticsId
+        default: break
         }
 
         return tmpUserInfo
@@ -34,6 +35,8 @@ extension PrimerKlarnaError: PrimerErrorProtocol {
             return "klarna-user-not-approved"
         case .klarnaSdkError:
             return "klarna-sdk-error"
+        default:
+            return "klarna-unknown-error-id"
         }
     }