Merge branch 'dev' into disable-reload

Satellite-im · Jan 26, 2024 · deb4a80 · deb4a80
2 parents db5258d + 5bc3646
commit deb4a80
Show file tree

Hide file tree

Showing 74 changed files with 214 additions and 161 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,9 +45,9 @@ arboard = "3.2"
 humansize = "2.1.3"
 uuid = { version = "1", features = ["serde", "v4"] }
 libloading = "0.7.4"
-warp = { git = "https://github.com/Satellite-im/Warp", rev = "a92a3674cd1d2e700e5275beb606984160cb9532" }
-warp-ipfs = { git = "https://github.com/Satellite-im/Warp", rev = "a92a3674cd1d2e700e5275beb606984160cb9532" }
-warp-blink-wrtc = { git = "https://github.com/Satellite-im/Warp", rev = "a92a3674cd1d2e700e5275beb606984160cb9532" }
+warp = { git = "https://github.com/Satellite-im/Warp", rev = "32f4c53fc462d53553a31762ecd12b4af9329a4a" }
+warp-ipfs = { git = "https://github.com/Satellite-im/Warp", rev = "32f4c53fc462d53553a31762ecd12b4af9329a4a" }
+warp-blink-wrtc = { git = "https://github.com/Satellite-im/Warp", rev = "32f4c53fc462d53553a31762ecd12b4af9329a4a" }
 rfd = "0.11.3"
 mime = "0.3.16"
 serde = "1.0"
@@ -72,6 +72,9 @@ tempfile = "3.0.7"
 fdlimit = "0.2"
 
 once_cell = "1.17"
+parking_lot = { version = "0.12" }
+tracing = { version = "0.1" }
+tracing-futures = { version = "0.2" }
 
 futures = "0.3"
 tokio = { version = "1", features = ["full"] }

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -28,6 +28,8 @@ names = "0.14.0"
 titlecase = { workspace = true }
 substring = "1.4.5"
 plot_icon = "0.3.0"
+tracing.workspace = true
+parking_lot.workspace = true
 icons = { workspace = true }
 humansize = { workspace = true }
 zip = "0.6.4"

diff --git a/common/locales/bs-BA/bs-BA.ftl b/common/locales/bs-BA/bs-BA.ftl
@@ -296,7 +296,7 @@ settings-keybinds = Postavke Tipkovnih Prečaca
     .toggle-deafen = Uključi/isključi sve zvukove, uključujući mikrofon i slušalice.
     .conflicting-keybinds = Sukobljeni Tipkovni Prečaci.
     .change-keybind = Snimi novi tipkovni prečac
-    .open-dev-tools = Otvori Web Inspektora
+    .open-close-dev-tools = Otvori/Zatvori Web Inspektora
     .toggle-devmode = Uključi/isključi Razvojni Način
     .cancel-change-keybind = Odustani od snimanja
 

diff --git a/common/locales/en-US/main.ftl b/common/locales/en-US/main.ftl
@@ -296,7 +296,7 @@ settings-keybinds = Keybind Settings
     .toggle-deafen = Toggle turning off all sounds including your microphone and headphones.
     .conflicting-keybinds = Conflicting Keybind.
     .change-keybind = Record New keybind
-    .open-dev-tools = Open Web Inspector
+    .open-close-dev-tools = Open/Close Web Inspector
     .toggle-devmode = Toggle Developer Mode
     .cancel-change-keybind = Cancel Recording
     .hide-focus-uplink = Hide/Focus Uplink

diff --git a/common/locales/sr-RS/sr-RS.ftl b/common/locales/sr-RS/sr-RS.ftl
@@ -296,7 +296,7 @@ settings-keybinds = Поставке тастатурских пречица
     .toggle-deafen = Промените искључивање свих звукова, укључујући микрофон и слушалице.
     .conflicting-keybinds = Сукоб тастатурских пречица.
     .change-keybind = Запиши нову тастатурску пречицу
-    .open-dev-tools = Отвори веб инспектор
+    .open-close-dev-tools = Отвори/Затвори веб инспектор
     .toggle-devmode = Промени режим програмера
     .cancel-change-keybind = Откажи записivanje
 

diff --git a/common/src/language/mod.rs b/common/src/language/mod.rs
@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use fluent_templates::{
     fluent_bundle::FluentValue, once_cell::sync::Lazy, LanguageIdentifier, Loader,
 };
+use parking_lot::RwLock;
 use unic_langid::langid;
-use warp::sync::RwLock;
 
 use crate::LOCALES;
 

diff --git a/common/src/notifications.rs b/common/src/notifications.rs
@@ -6,8 +6,8 @@ use super::sounds::{Play, Sounds};
 use derive_more::Display;
 use notify_rust::Notification;
 use std::sync::Arc;
+use tracing::log;
 use uuid::Uuid;
-use warp::logging::tracing::log;
 
 use once_cell::sync::Lazy;
 use tokio::sync::{

diff --git a/common/src/sounds.rs b/common/src/sounds.rs
@@ -2,7 +2,7 @@ use std::sync::{
     atomic::{AtomicBool, Ordering},
     Arc,
 };
-use warp::logging::tracing::log;
+use tracing::log;
 
 pub enum Sounds {
     Notification,

diff --git a/common/src/state/configuration.rs b/common/src/state/configuration.rs
@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use warp::logging::tracing::log;
+use tracing::log;
 
 use crate::STATIC_ARGS;
 

diff --git a/common/src/state/default_keybinds.rs b/common/src/state/default_keybinds.rs
@@ -46,7 +46,7 @@ pub fn get_default_keybinds() -> Vec<(GlobalShortcut, Shortcut)> {
             )),
         ),
         (
-            GlobalShortcut::OpenDevTools,
+            GlobalShortcut::OpenCloseDevTools,
             Shortcut::from((
                 vec![KeyCode::I],
                 vec![ModifiersState::CONTROL, ModifiersState::SHIFT],

diff --git a/common/src/state/mod.rs b/common/src/state/mod.rs
@@ -51,12 +51,9 @@ use std::{
     time::{Duration, Instant},
 };
 use uuid::Uuid;
-use warp::{
-    crypto::DID,
-    logging::tracing::log,
-    multipass::identity::IdentityStatus,
-    raygun::{self},
-};
+use warp::{crypto::DID, multipass::identity::IdentityStatus, raygun};
+
+use tracing::log;
 
 use self::call::Call;
 use self::pending_message::PendingMessage;

diff --git a/common/src/state/settings.rs b/common/src/state/settings.rs
@@ -16,7 +16,7 @@ pub enum GlobalShortcut {
     ToggleDeafen,
     IncreaseFontSize,
     DecreaseFontSize,
-    OpenDevTools,
+    OpenCloseDevTools,
     ToggleDevmode,
     SetAppVisible,
     #[default]
@@ -30,7 +30,7 @@ impl fmt::Display for GlobalShortcut {
             GlobalShortcut::ToggleDeafen => write!(f, "ToggleDeafen"),
             GlobalShortcut::IncreaseFontSize => write!(f, "IncreaseFontSize"),
             GlobalShortcut::DecreaseFontSize => write!(f, "DecreaseFontSize"),
-            GlobalShortcut::OpenDevTools => write!(f, "OpenDevTools"),
+            GlobalShortcut::OpenCloseDevTools => write!(f, "OpenCloseDevTools"),
             GlobalShortcut::ToggleDevmode => write!(f, "ToggleDevmode"),
             GlobalShortcut::SetAppVisible => write!(f, "SetAppVisible"),
             GlobalShortcut::Unknown => write!(f, "Unknown"),

diff --git a/common/src/state/ui.rs b/common/src/state/ui.rs
@@ -11,8 +11,8 @@ use std::{
     collections::{hash_map, HashMap},
     rc::Weak,
 };
+use tracing::log;
 use uuid::Uuid;
-use warp::logging::tracing::log;
 
 use super::{call, notifications::Notifications};
 

diff --git a/common/src/state/utils.rs b/common/src/state/utils.rs
@@ -4,8 +4,8 @@ use std::{
 };
 
 use titlecase::titlecase;
+use tracing::log;
 use walkdir::WalkDir;
-use warp::logging::tracing::log;
 
 use crate::{get_extras_dir, STATIC_ARGS};
 

diff --git a/common/src/utils/clear_temp_files_dir.rs b/common/src/utils/clear_temp_files_dir.rs
@@ -1,5 +1,5 @@
 use std::{fs, io};
-use warp::logging::tracing::log;
+use tracing::log;
 
 use crate::STATIC_ARGS;
 

diff --git a/common/src/warp_runner/manager/commands/blink_commands.rs b/common/src/warp_runner/manager/commands/blink_commands.rs
@@ -1,8 +1,8 @@
 use derive_more::Display;
 use futures::channel::oneshot::{self};
 use tokio::sync::mpsc::UnboundedReceiver;
+use tracing::log;
 use uuid::Uuid;
-use warp::logging::tracing::log;
 use warp::{
     blink::{AudioDeviceConfig, AudioTestEvent},
     crypto::DID,

diff --git a/common/src/warp_runner/manager/commands/constellation_commands.rs b/common/src/warp_runner/manager/commands/constellation_commands.rs
@@ -29,10 +29,11 @@ use warp::{
         ConstellationProgressStream, Progression,
     },
     error::Error,
-    logging::tracing::log,
-    sync::RwLock,
 };
 
+use parking_lot::RwLock;
+use tracing::log;
+
 static DIRECTORIES_AVAILABLE_TO_BROWSE: Lazy<RwLock<Vec<Directory>>> =
     Lazy::new(|| RwLock::new(Vec::new()));
 

diff --git a/common/src/warp_runner/manager/commands/multipass_commands.rs b/common/src/warp_runner/manager/commands/multipass_commands.rs
@@ -7,13 +7,14 @@ use warp::{
     constellation::file::FileType,
     crypto::DID,
     error::Error,
-    logging::tracing::log,
     multipass::{
         self,
         identity::{self, Identifier, IdentityImage, IdentityStatus, IdentityUpdate},
     },
 };
 
+use tracing::log;
+
 use crate::{
     state::{self, Identity},
     warp_runner::{ui_adapter::dids_to_identity, Account},

diff --git a/common/src/warp_runner/manager/commands/other_commands.rs b/common/src/warp_runner/manager/commands/other_commands.rs
@@ -8,7 +8,10 @@ use zip::{result::ZipError, write::FileOptions};
 
 use derive_more::Display;
 use futures::channel::oneshot;
-use warp::{error, logging::tracing::log};
+use warp::error;
+
+use tracing::log;
+
 #[derive(Display)]
 pub enum OtherCmd {
     #[display(fmt = "CompressFolder {{ src: {src:?}, dest: {dest:?} }} ")]

diff --git a/common/src/warp_runner/manager/commands/raygun_commands.rs b/common/src/warp_runner/manager/commands/raygun_commands.rs
@@ -11,13 +11,14 @@ use warp::{
     constellation::ConstellationProgressStream,
     crypto::DID,
     error::Error,
-    logging::tracing::log,
     raygun::{
         self, AttachmentEventStream, ConversationType, GroupSettings, Location, PinState,
         ReactionState,
     },
 };
 
+use tracing::log;
+
 use crate::{
     state::{chats, identity, Friends},
     warp_runner::{

diff --git a/common/src/warp_runner/manager/events.rs b/common/src/warp_runner/manager/events.rs
@@ -1,10 +1,11 @@
 use warp::{
     blink::BlinkEventKind,
-    logging::tracing::log,
     multipass::MultiPassEventKind,
     raygun::{MessageEventKind, RayGunEventKind},
 };
 
+use tracing::log;
+
 use crate::{
     warp_runner::{
         conv_stream,

diff --git a/common/src/warp_runner/manager/mod.rs b/common/src/warp_runner/manager/mod.rs
@@ -7,10 +7,12 @@ use std::sync::Arc;
 use tokio::sync::Notify;
 
 use warp::{
-    blink::BlinkEventStream, logging::tracing::log, multipass::MultiPassEventStream,
-    raygun::RayGunEventStream, tesseract::Tesseract,
+    blink::BlinkEventStream, multipass::MultiPassEventStream, raygun::RayGunEventStream,
+    tesseract::Tesseract,
 };
 
+use tracing::log;
+
 use super::{conv_stream, Account, Calling, Messaging, Storage};
 use crate::WARP_CMD_CH;