Disable Humble Trove support (#611)

tkashkin · Feb 5, 2022 · 448a0bd · 448a0bd
1 parent f5aa1ff
commit 448a0bd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.16.1-{build}-{branch}
+version: 0.16.2-{build}-{branch}
 
 pull_requests:
   do_not_increment_build_number: true

diff --git a/data/com.github.tkashkin.gamehub.gschema.xml.in b/data/com.github.tkashkin.gamehub.gschema.xml.in
@@ -179,7 +179,7 @@
 				<summary>Humble access token</summary>
 			</key>
 			<key name="load-trove-games" type="b">
-				<default>true</default>
+				<default>false</default>
 				<summary>Is Trove enabled</summary>
 			</key>
 		</schema>

diff --git a/meson.build b/meson.build
@@ -1,4 +1,4 @@
-project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.16.1')
+project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.16.2')
 
 i18n = import('i18n')
 gnome = import('gnome')

diff --git a/src/data/sources/humble/Trove.vala b/src/data/sources/humble/Trove.vala
@@ -35,7 +35,11 @@ namespace GameHub.Data.Sources.Humble
 
 		public override bool enabled
 		{
-			get { return Settings.Auth.Humble.instance.enabled && Settings.Auth.Humble.instance.load_trove_games; }
+			get {
+				// Disable Trove unconditionally: https://github.com/tkashkin/GameHub/issues/611
+				// return Settings.Auth.Humble.instance.enabled && Settings.Auth.Humble.instance.load_trove_games;
+				return false;
+			}
 			set { Settings.Auth.Humble.instance.load_trove_games = value; }
 		}
 
@@ -86,7 +90,9 @@ namespace GameHub.Data.Sources.Humble
 				{
 					var xpath = new Xml.XPath.Context(html);
 
-					var trove_json = xpath.eval("//script[@id='webpack-monthly-trove-data']/text()")->nodesetval->item(0)->content.strip();
+					var xpath_object = xpath.eval("//script[@id='webpack-monthly-trove-data']/text()");
+					var xpath_nodeset = xpath_object != null ? xpath_object->nodesetval : null;
+					var trove_json = xpath_nodeset != null && !xpath_nodeset->is_empty() ? xpath_nodeset->item(0)->content.strip() : null;
 
 					if(trove_json != null)
 					{

diff --git a/src/ui/dialogs/SettingsDialog/pages/sources/Humble.vala b/src/ui/dialogs/SettingsDialog/pages/sources/Humble.vala
@@ -47,7 +47,8 @@ namespace GameHub.UI.Dialogs.SettingsDialog.Pages.Sources
 
 			humble_auth = Settings.Auth.Humble.instance;
 
-			add_switch(_("Load games from Humble Trove"), humble_auth.load_trove_games, v => { humble_auth.load_trove_games = v; update(); request_restart(); });
+			// Disable Trove unconditionally: https://github.com/tkashkin/GameHub/issues/611
+			// add_switch(_("Load games from Humble Trove"), humble_auth.load_trove_games, v => { humble_auth.load_trove_games = v; update(); request_restart(); });
 
 			add_separator();