From 925a9e43cb442d1c462c1aea5477f315eb9ede55 Mon Sep 17 00:00:00 2001
From: asur4s <todaymofish@gmail.com>
Date: Sat, 3 Sep 2022 21:49:58 -0400
Subject: [PATCH] Refactor: env of keyboard mode

---
 src/common.rs               | 11 +++++++++++
 src/ui/remote.rs            |  1 +
 src/ui_session_interface.rs |  7 +++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/common.rs b/src/common.rs
index 81adebb0a..2be4b5295 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -711,3 +711,14 @@ pub fn make_fd_flutter(id: i32, entries: &Vec<FileEntry>, only_count: bool) -> S
     m.insert("total_size".into(), json!(n as f64));
     serde_json::to_string(&m).unwrap_or("".into())
 }
+
+
+pub fn get_keyboard_mode() -> String {
+    return std::env::var("KEYBOARD_MODE")
+        .unwrap_or(String::from("legacy"))
+        .to_lowercase();
+}
+
+pub fn save_keyboard_mode(value: String) {
+    std::env::set_var("KEYBOARD_MODE", value);
+}
\ No newline at end of file
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 093ad901e..26f323831 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -1,3 +1,4 @@
+use crate::common::{get_keyboard_mode, save_keyboard_mode};
 use std::{
     collections::HashMap,
     ops::{Deref, DerefMut},
diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs
index 92a08ef3d..05f34f37a 100644
--- a/src/ui_session_interface.rs
+++ b/src/ui_session_interface.rs
@@ -7,6 +7,7 @@ use crate::client::{
     QualityStatus, KEY_MAP, SERVER_KEYBOARD_ENABLED,
 };
 use crate::{client::Data, client::Interface};
+use crate::common::{get_keyboard_mode, save_keyboard_mode};
 use async_trait::async_trait;
 
 use hbb_common::config::{Config, LocalConfig, PeerConfig};
@@ -58,13 +59,11 @@ impl<T: InvokeUi> Session<T> {
     }
 
     pub fn get_keyboard_mode(&self) -> String {
-        return std::env::var("KEYBOARD_MODE")
-            .unwrap_or(String::from("legacy"))
-            .to_lowercase();
+        return get_keyboard_mode();
     }
 
     pub fn save_keyboard_mode(&self, value: String) {
-        std::env::set_var("KEYBOARD_MODE", value);
+        save_keyboard_mode(value);
     }
 
     pub fn save_view_style(&mut self, value: String) {