From d3645feee654da71fa3ec9f7b49bb6e0c9e74845 Mon Sep 17 00:00:00 2001
From: 20kdc <asdd2808@gmail.com>
Date: Wed, 20 Dec 2023 21:50:50 +0000
Subject: [PATCH] Revert logging changes made for Android decoder error
 messages

---
 alvr/client_core/src/platform/android/decoder.rs | 16 ++++++++--------
 alvr/common/src/logging.rs                       |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/alvr/client_core/src/platform/android/decoder.rs b/alvr/client_core/src/platform/android/decoder.rs
index 463946e141..cd095300e5 100644
--- a/alvr/client_core/src/platform/android/decoder.rs
+++ b/alvr/client_core/src/platform/android/decoder.rs
@@ -170,14 +170,14 @@ fn decoder_attempt_setup(
         MediaCodec::from_decoder_type(&mime)
             .ok_or(anyhow!("unable to find decoder for mime type: {}", &mime))?
     };
-    decoder
-        .configure(
-            &format,
-            Some(&image_reader.window()?),
-            MediaCodecDirection::Decoder,
-        )
-        .with_context(|| "failed to configure decoder")?;
-    decoder.start().with_context(|| "failed to start decoder")?;
+    let decoder_configure_err = decoder.configure(
+        &format,
+        Some(&image_reader.window()?),
+        MediaCodecDirection::Decoder,
+    );
+    decoder_configure_err.with_context(|| format!("failed to configure decoder"))?;
+    let decoder_start_err = decoder.start();
+    decoder_start_err.with_context(|| format!("failed to start decoder"))?;
     Ok(decoder)
 }
 
diff --git a/alvr/common/src/logging.rs b/alvr/common/src/logging.rs
index d005c911b5..a02f3cc877 100644
--- a/alvr/common/src/logging.rs
+++ b/alvr/common/src/logging.rs
@@ -128,12 +128,11 @@ pub fn show_e_blocking<E: Display>(e: E) {
 }
 
 pub fn show_err<T, E: Display>(res: Result<T, E>) -> Option<T> {
-    res.map_err(|e| show_e_block(format!("{:#}", e), false))
-        .ok()
+    res.map_err(|e| show_e_block(e, false)).ok()
 }
 
 pub fn show_err_blocking<T, E: Display>(res: Result<T, E>) -> Option<T> {
-    res.map_err(|e| show_e_block(format!("{:#}", e), true)).ok()
+    res.map_err(|e| show_e_block(e, true)).ok()
 }
 
 pub trait ToAny<T> {