From 06f2b2608a26f8983f2a9e06660666f6a059940b Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabmus@disroot.org>
Date: Thu, 15 Aug 2024 15:31:15 +0200
Subject: [PATCH] fix: change wivrn upstream url; remove legacy pico apk

---
 src/builders/build_wivrn.rs |  2 +-
 src/ui/install_wivrn_box.rs | 58 +++++--------------------------------
 2 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/builders/build_wivrn.rs b/src/builders/build_wivrn.rs
index ad41824..588c61b 100644
--- a/src/builders/build_wivrn.rs
+++ b/src/builders/build_wivrn.rs
@@ -21,7 +21,7 @@ pub fn get_build_wivrn_jobs(profile: &Profile, clean_build: bool) -> VecDeque<Wo
         repo: profile
             .xrservice_repo
             .as_ref()
-            .unwrap_or(&"https://github.com/Meumeu/WiVRn".into())
+            .unwrap_or(&"https://github.com/WiVRn/WiVRn".into())
             .clone(),
         dir: profile.xrservice_path.clone(),
         branch: profile
diff --git a/src/ui/install_wivrn_box.rs b/src/ui/install_wivrn_box.rs
index 402c005..e2dc3b9 100644
--- a/src/ui/install_wivrn_box.rs
+++ b/src/ui/install_wivrn_box.rs
@@ -11,14 +11,9 @@ use crate::{
     downloader::download_file_sync,
     paths::wivrn_apk_download_path,
     profile::{Profile, XRServiceType},
-    stateless_action,
 };
 use gtk::{glib::clone, prelude::*};
-use relm4::{
-    actions::{ActionGroupName, RelmAction, RelmActionGroup},
-    new_action_group, new_stateless_action,
-    prelude::*,
-};
+use relm4::{new_action_group, new_stateless_action, prelude::*};
 use std::collections::VecDeque;
 
 const DOWNLOAD_ERROR: &str = "download error";
@@ -63,15 +58,6 @@ impl SimpleComponent for InstallWivrnBox {
     type Input = InstallWivrnBoxMsg;
     type Output = ();
 
-    menu! {
-        install_wivrn_menu: {
-            section! {
-                "_Standard (Oculus and other devices)" => WivrnApkStandardAction,
-                "_Pico" => WivrnApkPicoAction,
-            }
-        }
-    }
-
     view! {
         gtk::Box {
             set_orientation: gtk::Orientation::Vertical,
@@ -100,13 +86,17 @@ impl SimpleComponent for InstallWivrnBox {
                 set_wrap: true,
                 set_wrap_mode: gtk::pango::WrapMode::Word,
             },
-            gtk::MenuButton {
+            gtk::Button {
                 add_css_class: "suggested-action",
                 set_label: "Install WiVRn",
                 set_halign: gtk::Align::Start,
                 #[track = "model.changed(Self::install_wivrn_status())"]
                 set_sensitive: model.install_wivrn_status != InstallWivrnStatus::InProgress,
-                set_menu_model: Some(&install_wivrn_menu),
+                connect_clicked[sender] => move |_| {
+                     sender.input(Self::Input::InstallWivrnApk(
+                        "https://github.com/WiVRn/WiVRn/releases/latest/download/WiVRn-standard-release.apk".into()
+                     ))
+                },
             },
             gtk::Label {
                 add_css_class: "error",
@@ -244,40 +234,6 @@ impl SimpleComponent for InstallWivrnBox {
 
         let widgets = view_output!();
 
-        let mut actions = RelmActionGroup::<InstallWivrnActionGroup>::new();
-
-        stateless_action!(
-            actions,
-            WivrnApkStandardAction,
-            clone!(
-                #[strong]
-                sender,
-                move |_| {
-                    sender.input(Self::Input::InstallWivrnApk(
-                    "https://github.com/Meumeu/WiVRn/releases/latest/download/WiVRn-standard-release.apk".into()
-                ));
-                }
-            )
-        );
-        stateless_action!(
-            actions,
-            WivrnApkPicoAction,
-            clone!(
-                #[strong]
-                sender,
-                move |_| {
-                    sender.input(Self::Input::InstallWivrnApk(
-                    "https://github.com/Meumeu/WiVRn/releases/latest/download/WiVRn-pico-release.apk".into()
-                ));
-                }
-            )
-        );
-
-        root.insert_action_group(
-            InstallWivrnActionGroup::NAME,
-            Some(&actions.into_action_group()),
-        );
-
         ComponentParts { model, widgets }
     }
 }