From a511cd4ac3bed7df90cba250987bde719910c9e3 Mon Sep 17 00:00:00 2001
From: ChristianVisintin <christian.visintin1997@gmail.com>
Date: Tue, 15 Dec 2020 13:44:51 +0100
Subject: [PATCH] Read one input event at a time

---
 src/ui/activities/auth_activity/mod.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/ui/activities/auth_activity/mod.rs b/src/ui/activities/auth_activity/mod.rs
index 61cb46e..fc79be9 100644
--- a/src/ui/activities/auth_activity/mod.rs
+++ b/src/ui/activities/auth_activity/mod.rs
@@ -25,6 +25,7 @@
 
 // Sub modules
 mod bookmarks;
+mod callbacks;
 mod input;
 mod layout;
 
@@ -117,6 +118,8 @@ pub struct AuthActivity {
     redraw: bool,                  // Should ui actually be redrawned?
     input_txt: String,             // Input text
     choice_opt: DialogYesNoOption, // Dialog popup selected option
+    bookmarks_idx: usize,          // Index of selected bookmark
+    recents_idx: usize,            // Index of selected recent
 }
 
 impl Default for AuthActivity {
@@ -147,6 +150,8 @@ impl AuthActivity {
             redraw: true, // True at startup
             input_txt: String::new(),
             choice_opt: DialogYesNoOption::Yes,
+            bookmarks_idx: 0,
+            recents_idx: 0,
         }
     }
 }
@@ -180,14 +185,13 @@ impl Activity for AuthActivity {
         if self.context.is_none() {
             return;
         }
-        // Start catching Input Events
-        if let Ok(input_events) = self.context.as_ref().unwrap().input_hnd.fetch_events() {
-            if !input_events.is_empty() {
-                self.redraw = true; // Set redraw to true if there is at least one event
-            }
-            // Iterate over input events
-            for event in input_events.iter() {
-                self.handle_input_event(event);
+        // Read one event
+        if let Ok(event) = self.context.as_ref().unwrap().input_hnd.read_event() {
+            if let Some(event) = event {
+                // Set redraw to true
+                self.redraw = true;
+                // Handle event
+                self.handle_input_event(&event);
             }
         }
         // Redraw if necessary