[gnome-software] flatpak: Simplify setting permissions

[Kalev Lember <klember src gnome org>]

commit 3a2abd19be279d75ccaa87a2b9371d7d48cbb1af
Author: Kalev Lember <klember redhat com>
Date:   Tue Mar 5 13:11:50 2019 +0100

    flatpak: Simplify setting permissions

 plugins/flatpak/gs-flatpak.c | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)
---
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index 511138e5..c93fd931 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -154,31 +154,6 @@ perms_from_metadata (GKeyFile *keyfile)
        return permissions;
 }
 
-static void
-gs_flatpak_set_permissions (GsFlatpak *self, GsApp *app, FlatpakRef *xref)
-{
-       g_autoptr(GBytes) bytes = NULL;
-       g_autoptr(GKeyFile) keyfile = NULL;
-
-       keyfile = g_key_file_new ();
-
-       if (FLATPAK_IS_INSTALLED_REF (xref)) {
-               bytes = flatpak_installed_ref_load_metadata (FLATPAK_INSTALLED_REF (xref), NULL, NULL);
-       } else if (FLATPAK_IS_REMOTE_REF (xref) &&
-                  flatpak_remote_ref_get_metadata (FLATPAK_REMOTE_REF (xref)) != NULL) {
-               bytes = g_bytes_ref (flatpak_remote_ref_get_metadata (FLATPAK_REMOTE_REF (xref)));
-       } else {
-               return;
-       }
-
-       g_key_file_load_from_data (keyfile,
-                                  g_bytes_get_data (bytes, NULL),
-                                  g_bytes_get_size (bytes),
-                                  0, NULL);
-
-       gs_app_set_permissions (app, perms_from_metadata (keyfile));
-}
-
 static void
 gs_flatpak_set_update_permissions (GsFlatpak *self, GsApp *app, FlatpakInstalledRef *xref)
 {
@@ -238,8 +213,6 @@ gs_flatpak_set_metadata (GsFlatpak *self, GsApp *app, FlatpakRef *xref)
            gs_app_get_kind (app) == AS_APP_KIND_GENERIC) {
                gs_flatpak_set_kind_from_flatpak (app, xref);
        }
-
-       gs_flatpak_set_permissions (self, app, xref);
 }
 
 static GsApp *
@@ -1627,7 +1600,6 @@ gs_plugin_refine_item_origin (GsFlatpak *self,
                        gs_app_set_origin (app, remote_name);
                        gs_flatpak_app_set_commit (app, flatpak_ref_get_commit (FLATPAK_REF (xref)));
                        gs_plugin_refine_item_scope (self, app);
-                       gs_flatpak_set_permissions (self, app, FLATPAK_REF (xref));
                        return TRUE;
                }
                g_debug ("%s failed to find remote %s: %s",
@@ -1854,6 +1826,7 @@ gs_flatpak_set_app_metadata (GsFlatpak *self,
                        secure = FALSE;
        }
 
+       gs_app_set_permissions (app, perms_from_metadata (kf));
        /* this is actually quite hard to achieve */
        if (secure)
                gs_app_add_kudo (app, GS_APP_KUDO_SANDBOXED_SECURE);