[fractal] BKResponse, sync: remove error variants and compose over Result instead

[Alexandre Franke <afranke src gnome org>]

commit 07b722461203110d724f255763823fc4c3ff2445
Author: Alejandro Domínguez <adomu net-c com>
Date:   Mon Aug 26 11:02:45 2019 +0200

    BKResponse, sync: remove error variants and compose over Result instead

 fractal-gtk/src/app/backend_loop.rs     | 4 ++--
 fractal-matrix-api/src/backend/sync.rs  | 4 ++--
 fractal-matrix-api/src/backend/types.rs | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/fractal-gtk/src/app/backend_loop.rs b/fractal-gtk/src/app/backend_loop.rs
index 3dd65486..81d82c67 100644
--- a/fractal-gtk/src/app/backend_loop.rs
+++ b/fractal-gtk/src/app/backend_loop.rs
@@ -87,7 +87,7 @@ pub fn backend_loop(rx: Receiver<BKResponse>) {
                     let av = Some(path);
                     APPOP!(show_new_avatar, (av));
                 }
-                Ok(BKResponse::Sync(since)) => {
+                Ok(BKResponse::Sync(Ok(since))) => {
                     info!("SYNC");
                     let s = Some(since);
                     APPOP!(synced, (s));
@@ -255,7 +255,7 @@ pub fn backend_loop(rx: Receiver<BKResponse>) {
                     APPOP!(reset_directory_state);
                     APPOP!(show_error, (error));
                 }
-                Ok(BKResponse::SyncError(err)) => {
+                Ok(BKResponse::Sync(Err(err))) => {
                     error!("SYNC Error: {:?}", err);
                     APPOP!(sync_error);
                 }
diff --git a/fractal-matrix-api/src/backend/sync.rs b/fractal-matrix-api/src/backend/sync.rs
index a2c34542..27a6811e 100644
--- a/fractal-matrix-api/src/backend/sync.rs
+++ b/fractal-matrix-api/src/backend/sync.rs
@@ -239,7 +239,7 @@ pub fn sync(bk: &Backend, new_since: Option<String>, initial: bool) {
 
                 let next_batch = response.next_batch;
                 data.lock().unwrap().since = Some(next_batch.clone()).filter(|s| !s.is_empty());
-                tx.send(BKResponse::Sync(next_batch))
+                tx.send(BKResponse::Sync(Ok(next_batch)))
                     .expect_log("Connection closed");
             }
             Err(err) => {
@@ -247,7 +247,7 @@ pub fn sync(bk: &Backend, new_since: Option<String>, initial: bool) {
                 error!("Sync Error, waiting 10 seconds to respond for the next sync");
                 thread::sleep(time::Duration::from_secs(10));
 
-                tx.send(BKResponse::SyncError(err))
+                tx.send(BKResponse::Sync(Err(err)))
                     .expect_log("Connection closed");
             }
         }
diff --git a/fractal-matrix-api/src/backend/types.rs b/fractal-matrix-api/src/backend/types.rs
index 9bee493f..40d0e945 100644
--- a/fractal-matrix-api/src/backend/types.rs
+++ b/fractal-matrix-api/src/backend/types.rs
@@ -104,7 +104,7 @@ pub enum BKResponse {
     AccountDestruction,
     Avatar(String),
     SetUserAvatar(String),
-    Sync(String),
+    Sync(Result<String, Error>),
     Rooms(Vec<Room>, Option<Room>),
     UpdateRooms(Vec<Room>),
     RoomDetail(Result<(String, String, String), Error>),
@@ -151,7 +151,6 @@ pub enum BKResponse {
     SetUserAvatarError(Error),
     LoginError(Error),
     GuestLoginError(Error),
-    SyncError(Error),
     SendTypingError(Error),
     SetRoomError(Error),
     CommandError(Error),