fix various minor bugs

Author: GyulyVGC

src/gui/pages/inspect_page.rs

@@ -35,6 +35,7 @@ use crate::translations::translations_2::{
     only_show_favorites_translation, showing_results_translation,
 };
 use crate::translations::translations_5::{only_show_blacklisted_translation, program_translation};
+use crate::utils::formatted_strings::clip_text;
 use crate::utils::types::icon::Icon;
 use crate::{Language, RunningPage, Sniffer, StyleType};
 
@@ -261,16 +262,9 @@ fn row_report_entry<'a>(
         let max_chars = report_col.get_max_chars(None);
         let col_value = report_col.get_value(key, val, data_repr);
         ret_val = ret_val.push(
-            Container::new(
-                Text::new(if col_value.len() <= max_chars {
-                    col_value
-                } else {
-                    [&col_value[..max_chars - 2], "…"].concat()
-                })
-                .class(text_type),
-            )
-            .align_x(Alignment::Center)
-            .width(report_col.get_width()),
+            Container::new(Text::new(clip_text(&col_value, max_chars)).class(text_type))
+                .align_x(Alignment::Center)
+                .width(report_col.get_width()),
         );
     }
     ret_val
@@ -412,7 +406,7 @@ fn filter_input<'a>(
 
     let mut input = TextInput::new("", filter_value)
         .on_input(move |new_value| {
-            Message::Search(filter_input_type.new_search(&search_params, new_value))
+            Message::Search(filter_input_type.new_search(&search_params, &new_value))
         })
         .padding([2, 5])
         .size(FONT_SIZE_FOOTER)
@@ -462,8 +456,9 @@ fn filter_combobox(
 
     let button_clear = button_clear_filter(filter_input_type.clear_search(&search_params));
 
-    let update_fn =
-        move |new_value| Message::Search(filter_input_type.new_search(&search_params, new_value));
+    let update_fn = move |new_value: String| {
+        Message::Search(filter_input_type.new_search(&search_params, &new_value))
+    };
 
     let mut combobox = ComboBox::new(combo_box_state, "", Some(&filter_value), update_fn.clone())
         .on_input(update_fn)

src/networking/manage_packets.rs

@@ -124,7 +124,7 @@ fn analyze_network_header(
         Some(NetHeaders::Ipv6(ipv6header, _)) => {
             *address1 = IpAddr::from(ipv6header.source);
             *address2 = IpAddr::from(ipv6header.destination);
-            *exchanged_bytes += u128::from(40 + ipv6header.payload_length);
+            *exchanged_bytes += u128::from(ipv6header.payload_length) + 40;
             true
         }
         Some(NetHeaders::Arp(arp_packet)) => {

src/notifications/notify_and_log.rs

@@ -43,7 +43,7 @@ pub fn notify_and_log(
             let notification = LoggedNotification::DataThresholdExceeded(DataThresholdExceeded {
                 id: logged_notifications.tot(),
                 data_repr,
-                threshold: notifications.data_notification.previous_threshold,
+                threshold,
                 data_info,
                 timestamp: get_formatted_timestamp(timestamp),
                 is_expanded: false,

src/report/types/search_parameters.rs

@@ -236,11 +236,7 @@ impl FilterInputType {
         result
     }
 
-    pub fn new_search(
-        self,
-        search_params: &SearchParameters,
-        new_value: String,
-    ) -> SearchParameters {
+    pub fn new_search(self, search_params: &SearchParameters, new_value: &str) -> SearchParameters {
         let mut result = search_params.clone();
         let trimmed = new_value.trim().to_string();
         match self {
@@ -252,7 +248,7 @@ impl FilterInputType {
             FilterInputType::Service => result.service = trimmed,
             FilterInputType::Domain => result.domain = trimmed,
             FilterInputType::Country => result.country = trimmed,
-            FilterInputType::AsName => result.as_name = new_value,
+            FilterInputType::AsName => result.as_name = trimmed,
             FilterInputType::Program => result.program = trimmed,
         }
         result

src/utils/formatted_strings.rs

@@ -145,7 +145,7 @@ pub fn clip_text(text: &str, max_chars: usize) -> String {
 
     let suspensions = if tot_len > max_chars { "…" } else { "" };
     let slice = if tot_len > max_chars {
-        &chars[..slice_len - 2]
+        &chars[..slice_len.saturating_sub(2)]
     } else {
         &chars[..slice_len]
     }