Add WPAppBrand

kean · kean · commit b81b93da9c00 · 2025-03-16T18:27:35.000-04:00
diff --git a/Modules/Sources/BuildSettingsKit/BuildSettings+Live.swift b/Modules/Sources/BuildSettingsKit/BuildSettings+Live.swift
@@ -4,9 +4,8 @@ import Foundation
 struct BuildSettingsLiveContainer: BuildSettingsContainer {
     static let shared = BuildSettingsLiveContainer()
 
-    // TODO: (kean) add actual value
     var brand: AppBrand {
-        .jetpack
+        AppBrand(rawValue: infoPlistValue(forKey: "WPAppBrand"))!
     }
 
     var appGroupName: String {
diff --git a/WordPress/Info.plist b/WordPress/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>wordpress</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/Jetpack/Info.plist b/WordPress/Jetpack/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>jetpack</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/JetpackDraftActionExtension/Info.plist b/WordPress/JetpackDraftActionExtension/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>jetpack</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/JetpackIntents/Info.plist b/WordPress/JetpackIntents/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>jetpack</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/JetpackNotificationServiceExtension/Info.plist b/WordPress/JetpackNotificationServiceExtension/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>jetpack</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/JetpackShareExtension/Info.plist b/WordPress/JetpackShareExtension/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>jetpack</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
@@ -42,34 +44,34 @@
                 (SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.image"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.png"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.jpeg"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.jpeg-2000"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.tiff"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.compuserve.gif"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.microsoft.bmp"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.image&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.png&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.jpeg&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.jpeg-2000&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.tiff&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;com.compuserve.gif&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;com.microsoft.bmp&quot;
                 ).@count &gt;= 1
                 OR
                 SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.plain-text"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.text"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.plain-text&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.text&quot;
                 ).@count == 1
                 OR
                 SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.file-url"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.url&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.file-url&quot;
                 ).@count == 1)
                 AND
                 SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.find-login-action"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.save-login-action"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.find-login-action&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.save-login-action&quot;
                 ).@count == 0
                 ).@count &gt;= 1
             </string>
diff --git a/WordPress/JetpackStatsWidgets/Info.plist b/WordPress/JetpackStatsWidgets/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>jetpack</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/WordPressDraftActionExtension/Info.plist b/WordPress/WordPressDraftActionExtension/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>wordpress</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/WordPressNotificationServiceExtension/Info.plist b/WordPress/WordPressNotificationServiceExtension/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>wordpress</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
diff --git a/WordPress/WordPressShareExtension/Info.plist b/WordPress/WordPressShareExtension/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>WPAppBrand</key>
+	<string>wordpress</string>
 	<key>WPAppGroupName</key>
 	<string>${WP_APP_GROUP_NAME}</string>
 	<key>WPAppKeychainAccessGroup</key>
@@ -35,43 +37,43 @@
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>NSExtensionActivationRule</key>
-            <string>
+			<string>
                 SUBQUERY(
                 extensionItems,
                 $extensionItem,
                 (SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.image"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.png"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.jpeg"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.jpeg-2000"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.tiff"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.compuserve.gif"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.microsoft.bmp"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.image&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.png&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.jpeg&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.jpeg-2000&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.tiff&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;com.compuserve.gif&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;com.microsoft.bmp&quot;
                 ).@count &gt;= 1
                 OR
                 SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.plain-text"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.text"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.plain-text&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.text&quot;
                 ).@count == 1
                 OR
                 SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.file-url"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.url&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.file-url&quot;
                 ).@count == 1)
                 AND
                 SUBQUERY(
                 $extensionItem.attachments,
                 $attachment,
-                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.find-login-action"
-                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.save-login-action"
+                ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.find-login-action&quot;
+                || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.save-login-action&quot;
                 ).@count == 0
-                ).@count >= 1
+                ).@count &gt;= 1
             </string>
 			<key>NSExtensionJavaScriptPreprocessingFile</key>
 			<string>WordPressShare</string>

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,8 @@ import Foundation`
`4`	`4`	`struct BuildSettingsLiveContainer: BuildSettingsContainer {`
`5`	`5`	`static let shared = BuildSettingsLiveContainer()`
`6`	`6`
`7`		`- // TODO: (kean) add actual value`
`8`	`7`	`var brand: AppBrand {`
`9`		`- .jetpack`
	`8`	`+ AppBrand(rawValue: infoPlistValue(forKey: "WPAppBrand"))!`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`var appGroupName: String {`