Merge lp:~artem-anufrij/audience/Bugfix-1386040 into lp:~audience-members/audience/trunk

[Artem Anufrij]

Check privacy mode. IF ENABLED: don't save the settings (last videos, current video, process, last folder).

[Viko Adi Rahmawan (vikoadi)]

I think this process of defining what to save and what to open is a really complex task. As we see in the switchboard we have a blacklisting based on file path and what open it.

Checking this gsettings might be not enough and we need a more sophisticated process involving Zeitgeist , Gtk.RecentManager, etc. And it might be useful for other project too, it would be awesome if it can be a part of Granite.

I don't know about how Security and Privacy is designed in pantheon, and i think it need to be discussed in a bigger forum.

[Danielle Foré (danrabbit)]

I think for the purpose of this bug report, it would be acceptable to just not write any changes to gsettings while privacy mode is active.

[kay van der Zander (kay20)]

hey nice job on including privacy.
still there are some bad parts as in not functional or not readable enough.
please fix them.

review: Needs Fixing (code)

Unmerged revisions

460. By artem-anufrij on 2014-11-11

Check privacy mode. IF ENABLE: don't save the settings (last videos, current video, process, last folder).

459. By artem-anufrij on 2014-11-11

Check privacy mode. IF ENABLE: don't save the settings (last videos, current video, process).

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2015-09-21 18:26:27 +0000
+++ src/Audience.vala	2015-10-15 21:57:54 +0000
@@ -234,6 +234,107 @@
                 default:
                     break;
             }
+<<<<<<< TREE
+=======
+
+            return true;
+        }
+
+        private void on_configure_window (uint video_w, uint video_h) {
+            Gdk.Rectangle monitor;
+            var screen = Gdk.Screen.get_default ();
+            screen.get_monitor_geometry (screen.get_monitor_at_window (mainwindow.get_window ()), out monitor);
+
+            int width = 0, height = 0;
+            if (monitor.width > video_w && monitor.height > video_h) {
+                width = (int)video_w;
+                height = (int)video_h;
+            } else {
+                width = (int)(monitor.width * 0.9);
+                height = (int)((double)video_h / video_w * width);
+            }
+
+            mainwindow.get_window ().move_resize (monitor.width / 2 - width / 2 + monitor.x,
+                monitor.height / 2 - height / 2 + monitor.y,
+                width, height);
+
+            if (settings.keep_aspect) {
+                var geom = Gdk.Geometry ();
+                geom.min_aspect = geom.max_aspect = video_w / (double)video_h;
+                mainwindow.get_window ().set_geometry_hints (geom, Gdk.WindowHints.ASPECT);
+            }
+        }
+
+        private void on_window_state_changed (Gdk.WindowState window_state) {
+            bool currently_maximized = (window_state & Gdk.WindowState.MAXIMIZED) == 0;
+
+            if (!currently_maximized && !fullscreened && !welcome.is_visible ()) {
+                mainwindow.fullscreen ();
+                fullscreened = true;
+            }
+        }
+
+        /*DnD*/
+        private void setup_drag_n_drop () {
+            Gtk.TargetEntry uris = {"text/uri-list", 0, 0};
+            Gtk.drag_dest_set (mainwindow, Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
+            mainwindow.drag_data_received.connect ( (ctx, x, y, sel, info, time) => {
+                foreach (var uri in sel.get_uris ()) {
+                    open_file (uri);
+                }
+
+                welcome.hide ();
+                clutter.show_all ();
+            });
+        }
+
+        private void on_destroy () {
+
+            if (is_privacy_mode_enabled ()) {
+                clear_video_settings ();
+                return;
+            }
+
+            if (video_player.uri.has_prefix ("dvd://")) {
+                clear_video_settings ();
+                return;
+            }
+
+            if (video_player.uri == null || video_player.uri == "")
+                return;
+
+            save_last_played_videos ();
+        }
+
+        private int old_h = - 1;
+        private int old_w = - 1;
+        private void on_size_allocate (Gtk.Allocation alloc) {
+            if (alloc.width != old_w || alloc.height != old_h) {
+                if (video_player.relayout ()) {
+                    old_w = alloc.width;
+                    old_h = alloc.height;
+                }
+            }
+        }
+
+        private bool update_pointer_position (double y, int window_height) {
+            allocate_bottombar ();
+            mainwindow.get_window ().set_cursor (null);
+            if (bottom_bar_size == 0) {
+                int minimum = 0;
+                bottom_bar.get_preferred_height (out minimum, out bottom_bar_size);
+            }
+
+            if (bottom_bar.child_revealed == false)
+                bottom_bar.set_reveal_child (true);
+
+            if (y >= (window_height - bottom_bar_size) && y < window_height) {
+                bottom_bar.hovered = true;
+            } else {
+                bottom_bar.hovered = false;
+            }
+
+>>>>>>> MERGE-SOURCE
             return false;
         }
 
@@ -241,8 +342,18 @@
             settings.last_stopped = 0;
             settings.last_played_videos = null;
             settings.current_video = "";
-        }
-
+            settings.last_folder = "";
+        }
+
+<<<<<<< TREE
+=======
+        private void restore_playlist () {
+            foreach (var filename in settings.last_played_videos) {
+                playlist.add_item (File.new_for_uri (filename));
+            }
+        }
+
+>>>>>>> MERGE-SOURCE
         public void run_open_file () {
             var file = new Gtk.FileChooserDialog (_("Open"), mainwindow, Gtk.FileChooserAction.OPEN,
                 _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
@@ -320,8 +431,30 @@
         }
 
         public override void activate () {
+<<<<<<< TREE
             if (mainwindow == null) {
                 build ();
+=======
+            build ();
+
+            if (is_privacy_mode_enabled ())
+                return;
+
+            if (settings.resume_videos == true
+                && settings.last_played_videos.length > 0
+                && settings.current_video != ""
+                && file_exists (settings.current_video)) {
+                restore_playlist ();
+
+                if (settings.last_stopped > 0) {
+                    welcome.hide ();
+                    clutter.show_all ();
+                    open_file (settings.current_video);
+                    video_player.playing = false;
+                    Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
+                    video_player.playing = !settings.playback_wait;
+                }
+>>>>>>> MERGE-SOURCE
             }
         }
 
@@ -369,7 +502,15 @@
 
 
         }
-
+<<<<<<< TREE
+
+=======
+
+        public bool is_privacy_mode_enabled () {
+            var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
+            return privacy_settings.get_boolean ("remember-recent-files") || privacy_settings.get_boolean ("remember-app-usage");
+        }
+>>>>>>> MERGE-SOURCE
     }
 }