remove enum for appPlatform because space is breaking kotlin generation

matrix-org · Mar 26, 2024 · 066bb54 · 066bb54
1 parent 41754bb
commit 066bb54
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 34 deletions.
diff --git a/schemas/SuperProperties.json b/schemas/SuperProperties.json
@@ -15,12 +15,8 @@
       "type": "string"
     },
     "appPlatform": {
-      "description": "Used by web to identify the platform (Web/Electron)",
-      "type": "string",
-      "oneOf": [
-        {"const": "Web Platform", "description": "Web version of the app."},
-        {"const": "Electron Platform", "description": "Desktop version of the app."}
-      ]
+      "description": "Used by web to identify the platform (Web Platform/Electron Platform)",
+      "type": "string"
     }
   },
   "required": [],

diff --git a/types/kotlin/SuperProperties.kt b/types/kotlin/SuperProperties.kt
@@ -7,7 +7,7 @@ package quicktype
  */
 data class SuperProperties (
     /**
-     * Used by web to identify the platform (Web/Electron)
+     * Used by web to identify the platform (Web Platform/Electron Platform)
      */
     val appPlatform: String? = null,
 

diff --git a/types/kotlin2/SuperProperties.kt b/types/kotlin2/SuperProperties.kt
@@ -26,9 +26,9 @@ package im.vector.app.features.analytics.plan
  */
 data class SuperProperties(
         /**
-         * Used by web to identify the platform (Web/Electron)
+         * Used by web to identify the platform (Web Platform/Electron Platform)
          */
-        val appPlatform: AppPlatform? = null,
+        val appPlatform: String? = null,
         /**
          * Which crypto backend is the client currently using.
          */
@@ -51,22 +51,9 @@ data class SuperProperties(
         Rust,
     }
 
-    enum class AppPlatform {
-
-        /**
-         * Desktop version of the app.
-         */
-        Electron Platform,
-
-        /**
-         * Web version of the app.
-         */
-        Web Platform,
-    }
-
     fun getProperties(): Map<String, Any>? {
         return mutableMapOf<String, Any>().apply {
-            appPlatform?.let { put("appPlatform", it.name) }
+            appPlatform?.let { put("appPlatform", it) }
             cryptoSDK?.let { put("cryptoSDK", it.name) }
             cryptoSDKVersion?.let { put("cryptoSDKVersion", it) }
         }.takeIf { it.isNotEmpty() }

diff --git a/types/swift/SuperProperties.swift b/types/swift/SuperProperties.swift
@@ -23,14 +23,14 @@ import Foundation
 extension AnalyticsEvent {
     public struct SuperProperties {
 
-        /// Used by web to identify the platform (Web/Electron)
-        public let appPlatform: AppPlatform?
+        /// Used by web to identify the platform (Web Platform/Electron Platform)
+        public let appPlatform: String?
         /// Which crypto backend is the client currently using.
         public let cryptoSDK: CryptoSDK?
         /// Version of the crypto backend.
         public let cryptoSDKVersion: String?
 
-        public init(appPlatform: AppPlatform?, cryptoSDK: CryptoSDK?, cryptoSDKVersion: String?) {
+        public init(appPlatform: String?, cryptoSDK: CryptoSDK?, cryptoSDKVersion: String?) {
             self.appPlatform = appPlatform
             self.cryptoSDK = cryptoSDK
             self.cryptoSDKVersion = cryptoSDKVersion
@@ -43,16 +43,9 @@ extension AnalyticsEvent {
             case Rust
         }
 
-        public enum AppPlatform: String {
-            /// Desktop version of the app.
-            case Electron Platform
-            /// Web version of the app.
-            case Web Platform
-        }
-
         public var properties: [String: Any?] {
             return [
-                "appPlatform": appPlatform?.rawValue,
+                "appPlatform": appPlatform,
                 "cryptoSDK": cryptoSDK?.rawValue,
                 "cryptoSDKVersion": cryptoSDKVersion
             ]