Merge lp:~lemonboy/noise/noise-privacy-mode into lp:~elementary-apps/noise/trunk

[The Lemon Man]

Respect Privacy Mode

[kay van der Zander (kay20)]

Hey nice work,

Please place the function privacy_mode_enabled inside a class. Logical would be the main class in settings.vala.

You get main_settings.privacy_mode_enabled() in the if statement in the on_quit function.

Next time no functions outside a class. In case of static it is allowed :) but not needed in this case.

review: Needs Fixing (code)

[The Lemon Man (lemonboy)]

Done :)

[kay van der Zander (kay20)]

Hey
You have made some code style faults. Please fix them :)

I will check the rest later. I have a feeling when you clean up, you made it to hard for yourself.

review: Needs Fixing (code)

[lp:~lemonboy/noise/noise-privacy-mode]

1846. By The Lemon Man on 2015-10-20

Respect the privacy mode when enabled.

[Corentin Noël (tintou)]

Okay to me

review: Approve

[kay van der Zander (kay20)]

review: Approve

=== modified file 'core/Settings.vala'
--- core/Settings.vala	2015-08-24 16:05:21 +0000
+++ core/Settings.vala	2015-10-20 19:30:43 +0000
@@ -29,7 +29,6 @@
  */
 
 namespace Noise.Settings {
-
     public class SavedState : Granite.Services.Settings {
 
         public int window_width { get; set; }
@@ -85,6 +84,12 @@
             return main_settings;
         }
 
+        public bool privacy_mode_enabled () {
+            var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
+            return privacy_settings.get_boolean ("remember-app-usage") ||
+                   privacy_settings.get_boolean ("remember-recent-files");
+        }
+
         private Main ()  {
             base ("org.pantheon.noise.settings");
             if (music_folder == "") {
@@ -115,19 +120,19 @@
 
         public Gee.Collection<Noise.EqualizerPreset> getPresets () {
             var presets_data = new Gee.TreeSet<string> ();
-            
+
             if (custom_presets != null) {
                 for (int i = 0; i < custom_presets.length; i++) {
                     presets_data.add (custom_presets[i]);
                 }
             }
-            
+
             var rv = new Gee.TreeSet<Noise.EqualizerPreset>();
-            
+
             foreach (var preset_str in presets_data) {
                 rv.add (new Noise.EqualizerPreset.from_string (preset_str));
             }
-            
+
             return rv.read_only_view;
         }
     }
 
=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2015-08-27 10:06:14 +0000
+++ src/LibraryWindow.vala	2015-10-20 19:30:43 +0000
@@ -1236,12 +1236,14 @@
     }
 
     private void on_quit () {
-        // Save media position and info
-        main_settings.last_media_position = (int)((double)App.player.player.get_position
-        ()/TimeUtils.NANO_INV);
-        if(App.player.current_media != null) {
-            App.player.current_media.resume_pos = (int)((double)App.player.player.get_position()/TimeUtils.NANO_INV);
-            library_manager.update_media (App.player.current_media, false, false);
+        if (!main_settings.privacy_mode_enabled ()) {
+            // Save media position and info
+            main_settings.last_media_position = (int)((double)App.player.player.get_position
+            ()/TimeUtils.NANO_INV);
+            if(App.player.current_media != null) {
+                App.player.current_media.resume_pos = (int)((double)App.player.player.get_position()/TimeUtils.NANO_INV);
+                library_manager.update_media (App.player.current_media, false, false);
+            }
         }
         App.player.player.pause();
 
@@ -1250,7 +1252,9 @@
         saved_state.view_mode = viewSelector.selected;
 
         // Search
-        main_settings.search_string = searchField.text;
+        if (!main_settings.privacy_mode_enabled ()) {
+            main_settings.search_string = searchField.text;
+        }
         
         // Save info pane (context pane) width
         saved_state.more_width = info_panel.get_allocated_width ();
 
=== modified file 'src/PlaybackManager.vala'
--- src/PlaybackManager.vala	2015-08-15 09:47:21 +0000
+++ src/PlaybackManager.vala	2015-10-20 19:30:43 +0000
@@ -546,8 +546,9 @@
             player.pause ();
         
         //update settings
-        if (m.rowid >= 0)
+        if (m.rowid >= 0 && !Settings.Main.get_default ().privacy_mode_enabled ()) {
             Settings.Main.get_default ().last_media_playing = m.rowid;
+        }
         
         if (m != null)
             media_played (m);
@@ -632,7 +633,9 @@
         if (current_media != null)
             was_playing = current_media.rowid;
         
-        Settings.Main.get_default ().last_media_playing = 0;
+        if (!Settings.Main.get_default ().privacy_mode_enabled ()) {
+            Settings.Main.get_default ().last_media_playing = 0;
+        }
         current_media = null;
         
         playback_stopped (was_playing);
 
=== modified file 'src/Views/ListView/Lists/GenericList.vala'
--- src/Views/ListView/Lists/GenericList.vala	2015-08-26 14:03:19 +0000
+++ src/Views/ListView/Lists/GenericList.vala	2015-10-20 19:30:43 +0000
@@ -283,15 +283,18 @@
 
         is_current_list = true;
         var main_settings = Settings.Main.get_default ();
-        if (playlist == null || playlist == ((Noise.LocalLibrary)libraries_manager.local_library).p_music || parent_wrapper.library != libraries_manager.local_library) {
-            main_settings.last_playlist_playing = "";
-        } else if (playlist is SmartPlaylist) {
-            main_settings.last_playlist_playing = "s%lld".printf (playlist.rowid);
-        } else {
-            if (((StaticPlaylist)playlist).read_only == false) {
-                main_settings.last_playlist_playing = "p%lld".printf (playlist.rowid);
+
+        if (!main_settings.privacy_mode_enabled ()) {
+            if (playlist == null || playlist == ((Noise.LocalLibrary)libraries_manager.local_library).p_music || parent_wrapper.library != libraries_manager.local_library) {
+                main_settings.last_playlist_playing = "";
+            } else if (playlist is SmartPlaylist) {
+                main_settings.last_playlist_playing = "s%lld".printf (playlist.rowid);
             } else {
-                main_settings.last_playlist_playing = "";
+                if (((StaticPlaylist)playlist).read_only == false) {
+                    main_settings.last_playlist_playing = "p%lld".printf (playlist.rowid);
+                } else {
+                    main_settings.last_playlist_playing = "";
+                }
             }
         }