Workaround for issue #86 to let Toastify run without the toast

aleab · Aug 10, 2018 · d5e4cd7 · d5e4cd7
1 parent aad1d7e
commit d5e4cd7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/Toastify/src/Core/Spotify.cs b/Toastify/src/Core/Spotify.cs
@@ -98,7 +98,7 @@ public bool IsMinimizedToTray
 
         public Song CurrentSong
         {
-            get { return this._currentSong ?? (this._currentSong = this.Status.Track); }
+            get { return this._currentSong ?? (this._currentSong = this.Status?.Track); }
             private set { this._currentSong = value; }
         }
 
@@ -143,11 +143,11 @@ public void InitLocalAPI()
             };
             this.localAPI = new SpotifyLocalAPI(this.localAPIConfig);
 
-            this.localAPI.OnTrackChange += this.SpotifyLocalAPI_OnTrackChange;
-            this.localAPI.OnPlayStateChange += this.SpotifyLocalAPI_OnPlayStateChange;
-            this.localAPI.OnTrackTimeChange += this.SpotifyLocalAPI_OnTrackTimeChange;
-            this.localAPI.OnVolumeChange += this.SpotifyLocalAPI_OnVolumeChange;
-            this.localAPI.ListenForEvents = true;
+            //this.localAPI.OnTrackChange += this.SpotifyLocalAPI_OnTrackChange;
+            //this.localAPI.OnPlayStateChange += this.SpotifyLocalAPI_OnPlayStateChange;
+            //this.localAPI.OnTrackTimeChange += this.SpotifyLocalAPI_OnTrackTimeChange;
+            //this.localAPI.OnVolumeChange += this.SpotifyLocalAPI_OnVolumeChange;
+            //this.localAPI.ListenForEvents = true;
         }
 
         public void StartSpotify()
@@ -183,7 +183,7 @@ private void StartSpotify_WorkerTask(object sender, DoWorkEventArgs e)
             this.spotifyProcess.EnableRaisingEvents = true;
             this.spotifyProcess.Exited += this.Spotify_Exited;
 
-            this.ConnectWithSpotify(e);
+            //this.ConnectWithSpotify(e);
         }
 
         private void StartSpotify_WorkerTaskCompleted(object sender, RunWorkerCompletedEventArgs e)

diff --git a/Toastify/src/Events/SpotifyStateEventArgs.cs b/Toastify/src/Events/SpotifyStateEventArgs.cs
@@ -19,7 +19,7 @@ public SpotifyStateEventArgs(Song currentSong, bool playing, double trackTime, d
             this.Volume = volume;
         }
 
-        public SpotifyStateEventArgs(StatusResponse spotifyStatus) : this(spotifyStatus.Track, spotifyStatus.Playing, spotifyStatus.PlayingPosition, spotifyStatus.Volume)
+        public SpotifyStateEventArgs(StatusResponse spotifyStatus) : this(spotifyStatus?.Track, spotifyStatus?.Playing ?? false, spotifyStatus?.PlayingPosition ?? -1, spotifyStatus?.Volume ?? -1)
         {
         }
     }

diff --git a/Toastify/src/Model/HotKey.cs b/Toastify/src/Model/HotKey.cs
@@ -530,6 +530,10 @@ private static void HotkeyActionCallback([NotNull] Hotkey hotkey)
             hotkey.LastPressTime = DateTime.Now;
             LastHotkey = hotkey;
 
+            // TODO: TEMPORARY FIX: Never show the toast on demand!
+            if (hotkey.Action == ToastifyAction.ShowToast)
+                return;
+
             if (logger.IsDebugEnabled)
                 logger.Debug($"HotkeyActionCallback: {hotkey.Action}");
 

diff --git a/Toastify/src/View/SettingsView.xaml b/Toastify/src/View/SettingsView.xaml
@@ -158,7 +158,7 @@
                     </Grid>
                 </Grid>
             </TabItem>
-            <TabItem Header="Toast" Name="TabToast">
+            <TabItem Header="Toast" Name="TabToast" Visibility="Collapsed">
                 <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <CheckBox Height="21" IsChecked="{Binding Path=Settings.DisableToast, Mode=TwoWay, Converter={StaticResource SettingValueToValueConverter}}" HorizontalAlignment="Left" Margin="12,10,0,0" VerticalAlignment="Top" VerticalContentAlignment="Center">Disable Toast</CheckBox>
 

diff --git a/Toastify/src/View/ToastView.xaml.cs b/Toastify/src/View/ToastView.xaml.cs
@@ -1087,7 +1087,7 @@ private void Spotify_TrackTimeChanged(object sender, SpotifyTrackTimeChangedEven
         private void SettingsView_Launched(object sender, SettingsViewLaunchedEventArgs e)
         {
             this.Settings = e.Settings;
-            this.ShowToastPreview(true);
+            //this.ShowToastPreview(true);
         }
 
         private void SettingsView_Closed(object sender, EventArgs e)