Remove preference for universal build as that will now be the default

Codeux-Software · Jul 11, 2021 · 66b3b37 · 66b3b37
1 parent d84a5ce
commit 66b3b37
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 33 deletions.
diff --git a/Sources/App/Classes/Controllers/TXMasterController.m b/Sources/App/Classes/Controllers/TXMasterController.m
@@ -281,11 +281,7 @@ - (void)prepareThirdPartyServiceSparkleFramework
 	BOOL receiveBetaUpdates = [TPCPreferences receiveBetaUpdates];
 
 	if (receiveBetaUpdates) {
-		if ([TPCPreferences receiveUniversalBetaUpdates]) {
-			[RZUserDefaults() setObject:sparkleData[@"SUFeedURL-beta-universal"] forKey:@"SUFeedURL"];
-		} else {
-			[RZUserDefaults() setObject:sparkleData[@"SUFeedURL-beta"] forKey:@"SUFeedURL"];
-		}
+		[RZUserDefaults() setObject:sparkleData[@"SUFeedURL-beta"] forKey:@"SUFeedURL"];
 	} else { // beta
 		[RZUserDefaults() setObject:sparkleData[@"SUFeedURL"] forKey:@"SUFeedURL"];
 	}

diff --git a/Sources/App/Classes/Headers/TPCPreferencesLocal.h b/Sources/App/Classes/Headers/TPCPreferencesLocal.h
@@ -129,7 +129,6 @@ typedef NS_ENUM(NSUInteger, TXPreferredAppearance) {
 
 #if TEXTUAL_BUILT_WITH_SPARKLE_ENABLED == 1
 + (BOOL)receiveBetaUpdates;
-+ (BOOL)receiveUniversalBetaUpdates;
 #endif
 
 + (BOOL)channelNavigationIsServerSpecific;

diff --git a/Sources/App/Classes/Preferences/TPCPreferencesLocal.m b/Sources/App/Classes/Preferences/TPCPreferencesLocal.m
@@ -529,11 +529,6 @@ + (BOOL)receiveBetaUpdates
 {
 	return [RZUserDefaults() boolForKey:@"ReceiveBetaUpdates"];
 }
-
-+ (BOOL)receiveUniversalBetaUpdates
-{
-	return [RZUserDefaults() boolForKey:@"ReceiveUniversalBetaUpdates"];
-}
 #endif
 
 #pragma mark -

diff --git a/Sources/App/Classes/Preferences/TPCPreferencesReload.m b/Sources/App/Classes/Preferences/TPCPreferencesReload.m
@@ -163,9 +163,7 @@ + (void)performReloadActionForKeys:(NSArray<NSString *> *)keys
 
 	/* Sparkle framework update feed URL */
 #if TEXTUAL_BUILT_WITH_SPARKLE_ENABLED == 1
-	if ([keys containsObject:@"ReceiveBetaUpdates"] ||
-		[keys containsObject:@"ReceiveUniversalBetaUpdates"])
-	{
+	if ([keys containsObject:@"ReceiveBetaUpdates"]) {
 		reloadAction |= TPCPreferencesReloadActionSparkleFrameworkFeedURL;
 	}
 #endif

diff --git a/Sources/App/Resources/Property Lists/3rdPartyStaticStoreSparkleFramework.plist b/Sources/App/Resources/Property Lists/3rdPartyStaticStoreSparkleFramework.plist
@@ -6,8 +6,6 @@
 	<string>https://textual-updates-backend.codeux.com/sparkle/feeds/v7/feed-one.xml</string>
 	<key>SUFeedURL-beta</key>
 	<string>https://textual-updates-backend.codeux.com/sparkle/feeds/v7/feed-one-beta.xml</string>
-	<key>SUFeedURL-beta-universal</key>
-	<string>https://textual-updates-backend.codeux.com/sparkle/feeds/v7/feed-one-beta-universal.xml</string>
 	<key>SUScheduledCheckInterval</key>
 	<string>345600</string>
 	<key>SUScheduledCheckInterval-beta</key>

diff --git a/Sources/App/Resources/Property Lists/RegisteredUserDefaultsInContainer.plist b/Sources/App/Resources/Property Lists/RegisteredUserDefaultsInContainer.plist
@@ -208,8 +208,6 @@
 	<true/>
 	<key>ReceiveBetaUpdates</key>
 	<false/>
-	<key>ReceiveUniversalBetaUpdates</key>
-	<false/>
 	<key>RejoinChannelOnLocalKick</key>
 	<false/>
 	<key>ReloadScrollbackOnLaunch</key>

diff --git a/Sources/App/Resources/User Interface/en.lproj/TDCPreferences.xib b/Sources/App/Resources/User Interface/en.lproj/TDCPreferences.xib
@@ -405,30 +405,16 @@
                                         <real value="3.4028234663852886e+38"/>
                                     </customSpacing>
                                 </stackView>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vah-p1-HXY">
-                                    <rect key="frame" x="259" y="-1" width="141" height="18"/>
-                                    <buttonCell key="cell" type="check" title="for universal builds" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Twp-8R-kHT">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <connections>
-                                        <action selector="onChangedCheckForBetaUpdates:" target="-2" id="iL0-Ri-Qtk"/>
-                                        <binding destination="G2Q-fc-ddg" name="enabled" keyPath="values.ReceiveBetaUpdates" id="GYu-qg-Pcu"/>
-                                        <binding destination="G2Q-fc-ddg" name="value" keyPath="values.ReceiveUniversalBetaUpdates" id="UhF-x6-UWb"/>
-                                    </connections>
-                                </button>
                             </subviews>
                             <constraints>
                                 <constraint firstItem="L50-Ud-iP2" firstAttribute="leading" secondItem="Arz-w3-aT6" secondAttribute="leading" constant="42" id="2ci-88-Tqp"/>
-                                <constraint firstItem="Vah-p1-HXY" firstAttribute="firstBaseline" secondItem="jfn-Sc-y1D" secondAttribute="firstBaseline" id="2vi-av-cbT"/>
                                 <constraint firstItem="rs1-p6-eOx" firstAttribute="leading" secondItem="L50-Ud-iP2" secondAttribute="trailing" constant="8" symbolic="YES" id="ILV-3z-JJV"/>
                                 <constraint firstItem="jfn-Sc-y1D" firstAttribute="leading" secondItem="rs1-p6-eOx" secondAttribute="leading" id="TJ6-iz-bg5"/>
                                 <constraint firstItem="jfn-Sc-y1D" firstAttribute="top" secondItem="rs1-p6-eOx" secondAttribute="bottom" constant="14" id="VDa-qC-Sx1"/>
                                 <constraint firstItem="rs1-p6-eOx" firstAttribute="top" secondItem="Arz-w3-aT6" secondAttribute="top" id="cow-PV-Rx2"/>
-                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Vah-p1-HXY" secondAttribute="trailing" constant="20" id="imq-4o-RQ9"/>
                                 <constraint firstItem="L50-Ud-iP2" firstAttribute="firstBaseline" secondItem="rkY-hK-RL3" secondAttribute="firstBaseline" id="mNv-78-rHy"/>
                                 <constraint firstAttribute="bottom" secondItem="jfn-Sc-y1D" secondAttribute="bottom" id="sJr-Sh-fkA"/>
-                                <constraint firstItem="Vah-p1-HXY" firstAttribute="leading" secondItem="jfn-Sc-y1D" secondAttribute="trailing" constant="8" symbolic="YES" id="uR1-AI-ahQ"/>
+                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="jfn-Sc-y1D" secondAttribute="trailing" constant="20" id="xQS-HA-Q0r"/>
                             </constraints>
                         </customView>
                     </subviews>