Merge pull request #205 from kevinaboos/more_login_status_updates

Add more details to status messages shown on the login screen.
project-robius · Oct 15, 2024 · 406d434 · 406d434
2 parents a308213 + 8c1e738
commit 406d434
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/login/login_screen.rs b/src/login/login_screen.rs
@@ -177,7 +177,7 @@ live_design! {
 
             status_label = <Label> {
                 width: 250, height: Fit
-                padding: {left: 5, right: 5}
+                padding: {left: 5, right: 5, top: 10, bottom: 10}
                 draw_text: {
                     color: (MESSAGE_TEXT_COLOR)
                     text_style: <REGULAR_TEXT> {}

diff --git a/src/persistent_state.rs b/src/persistent_state.rs
@@ -106,6 +106,13 @@ pub async fn restore_session(
     let FullSessionPersisted { client_session, user_session, sync_token } =
         serde_json::from_str(&serialized_session)?;
 
+    let status_str = format!(
+        "Loaded session file for {user_id}. Trying to connect to homeserver ({})...",
+        client_session.homeserver,
+    );
+    log!("{status_str}");
+    Cx::post_action(LoginAction::Status(status_str));
+
     // Build the client with the previous settings from the session.
     let client = Client::builder()
         .server_name_or_homeserver_url(client_session.homeserver)
@@ -115,7 +122,7 @@ pub async fn restore_session(
         .build()
         .await?;
 
-    let status_str = format!("Restoring previous login session for {}...", user_session.meta.user_id);
+    let status_str = format!("Authenticating previous login session for {}...", user_session.meta.user_id);
     log!("{status_str}");
     Cx::post_action(LoginAction::Status(status_str));
 

diff --git a/src/shared/avatar.rs b/src/shared/avatar.rs
@@ -70,7 +70,7 @@ live_design! {
             visible: false,
             align: { x: 0.5, y: 0.5 }
             img = <Image> {
-                fit: Smallest,
+                fit: Stretch,
                 width: Fill, height: Fill,
                 source: (IMG_DEFAULT_AVATAR),
                 draw_bg: {

diff --git a/src/sliding_sync.rs b/src/sliding_sync.rs
@@ -903,7 +903,7 @@ async fn async_main_loop(
         if let Some(session) = persistent_state::restore_session(specified_username).await.ok() {
             Some(session)
         } else {
-            let status_err = "Error: failed to restore previous user session.";
+            let status_err = "Error: failed to restore previous user session. Please login again.";
             log!("{status_err}");
             Cx::post_action(LoginAction::Status(status_err.to_string()));