fix(device): Improving iOSVersion consistency (#1514)

ionic-team · Mar 31, 2023 · b697fee · b697fee
1 parent d5d4584
commit b697fee
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/device/ios/Plugin/Device.swift b/device/ios/Plugin/Device.swift
@@ -80,10 +80,30 @@ import UIKit
     }
 
     public func getSystemVersionInt() -> Int? {
-        let majorVersion = UIDevice.current.systemVersion.split(separator: ".")
-        let majorVersionBig = majorVersion.joined()
-        let majorVersionBigInt = Int(majorVersionBig)
+        let exploded = UIDevice.current.systemVersion.split(separator: ".")
 
-        return majorVersionBigInt
+        var major = 0
+        var minor = 0
+        var patch = 0
+
+        for (index, numStr) in exploded.enumerated() {
+            switch index {
+            case 0:
+                major = Int(numStr) ?? 0
+            case 1:
+                minor = Int(numStr) ?? 0
+            case 2:
+                patch = Int(numStr) ?? 0
+            default:
+                break
+            }
+        }
+
+        var combined: [String] = []
+        combined.append(String(format: "%02d", major))
+        combined.append(String(format: "%02d", minor))
+        combined.append(String(format: "%02d", patch))
+
+        return Int(combined.joined())
     }
 }
diff --git a/device/src/definitions.ts b/device/src/definitions.ts
@@ -62,7 +62,7 @@ export interface DeviceInfo {
    *
    * Only available on iOS.
    *
-   * Multi-part version numbers are crushed down into an integer, ex: `"16.3.1"` -> `1631`
+   * Multi-part version numbers are crushed down into an integer padded to two-digits, ex: `"16.3.1"` -> `160301`
    *
    * @since 5.0.0
    */