Merge pull request #6373 from vector-im/aringenbach/6273_delete_riot_…

…defaults Remove legacy Riot-Defaults property list
element-hq · Jul 5, 2022 · 3330938 · 3330938
2 parents 8e45629 + 837bf0b
commit 3330938
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 131 deletions.
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -405,4 +405,17 @@ final class BuildSettings: NSObject {
     static let tileServerMapStyleURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx")!
 
     static let locationSharingEnabled = true
+
+    // MARK: - MXKAppSettings
+    static let enableBotCreation: Bool = false
+    static let maxAllowedMediaCacheSize: Int = 1073741824
+    static let presenceColorForOfflineUser: Int = 15020851
+    static let presenceColorForOnlineUser: Int = 3401011
+    static let presenceColorForUnavailableUser: Int = 15066368
+    static let showAllEventsInRoomHistory: Bool = false
+    static let showLeftMembersInRoomMemberList: Bool = false
+    static let showRedactionsInRoomHistory: Bool = true
+    static let showUnsupportedEventsInRoomHistory: Bool = false
+    static let sortRoomMembersUsingLastSeenTime: Bool = true
+    static let syncLocalContacts: Bool = false
 }
diff --git a/Riot/Assets/Riot-Defaults.plist b/Riot/Assets/Riot-Defaults.plist
diff --git a/Riot/Generated/RiotDefaults.swift b/Riot/Generated/RiotDefaults.swift
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -4375,16 +4375,24 @@ - (void)gdprConsentViewControllerDidConsentToGDPRWithSuccess:(GDPRConsentViewCon
 
 - (void)setupUserDefaults
 {
-    // Register "Riot-Defaults.plist" default values
-    NSString* userDefaults = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UserDefaults"];
-    NSString *defaultsPathFromApp = [[NSBundle mainBundle] pathForResource:userDefaults ofType:@"plist"];
-    NSMutableDictionary *defaults = [[NSDictionary dictionaryWithContentsOfFile:defaultsPathFromApp] mutableCopy];
-
-    //  add pusher ids, as they don't belong to plist anymore
-    defaults[@"pushKitAppIdProd"] = BuildSettings.pushKitAppIdProd;
-    defaults[@"pushKitAppIdDev"] = BuildSettings.pushKitAppIdDev;
-    defaults[@"pusherAppIdProd"] = BuildSettings.pusherAppIdProd;
-    defaults[@"pusherAppIdDev"] = BuildSettings.pusherAppIdDev;
+    // Register MatrixKit defaults.
+    NSDictionary *defaults = @{
+        @"enableBotCreation": @(BuildSettings.enableBotCreation),
+        @"maxAllowedMediaCacheSize": @(BuildSettings.maxAllowedMediaCacheSize),
+        @"presenceColorForOfflineUser": @(BuildSettings.presenceColorForOfflineUser),
+        @"presenceColorForOnlineUser": @(BuildSettings.presenceColorForOnlineUser),
+        @"presenceColorForUnavailableUser": @(BuildSettings.presenceColorForUnavailableUser),
+        @"showAllEventsInRoomHistory": @(BuildSettings.showAllEventsInRoomHistory),
+        @"showLeftMembersInRoomMemberList": @(BuildSettings.showLeftMembersInRoomMemberList),
+        @"showRedactionsInRoomHistory": @(BuildSettings.showRedactionsInRoomHistory),
+        @"showUnsupportedEventsInRoomHistory": @(BuildSettings.showUnsupportedEventsInRoomHistory),
+        @"sortRoomMembersUsingLastSeenTime": @(BuildSettings.syncLocalContacts),
+        @"syncLocalContacts": @(BuildSettings.syncLocalContacts),
+        @"pushKitAppIdProd": BuildSettings.pushKitAppIdProd,
+        @"pushKitAppIdDev": BuildSettings.pushKitAppIdDev,
+        @"pusherAppIdProd": BuildSettings.pusherAppIdProd,
+        @"pusherAppIdDev": BuildSettings.pusherAppIdDev
+    };
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
 

diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist
@@ -139,8 +139,6 @@
 			<string>im.vector.app.pills</string>
 		</dict>
 	</array>
-	<key>UserDefaults</key>
-	<string>${PRODUCT_NAME}-Defaults</string>
 	<key>applicationGroupIdentifier</key>
 	<string>$(APPLICATION_GROUP_IDENTIFIER)</string>
 	<key>baseBundleIdentifier</key>

diff --git a/Tools/SwiftGen/swiftgen-config.yml b/Tools/SwiftGen/swiftgen-config.yml
@@ -29,11 +29,4 @@ xcassets:
     - Assets/SharedImages.xcassets
   outputs:
     templatePath: Templates/Assets/swift4-element.stencil
-    output: Images.swift
-plist:
-  inputs: Assets/Riot-Defaults.plist
-  outputs:
-    templateName: runtime-swift4
-    output: RiotDefaults.swift
-    params:
-      enumName: RiotDefaults
+    output: Images.swift
diff --git a/changelog.d/6273.change b/changelog.d/6273.change
@@ -0,0 +1 @@
+Remove legacy Riot-Defaults property list