Commit 4d2c6aa6 authored by Leonardo Aramaki's avatar Leonardo Aramaki

Close sidebar on proper location; server first connect with exponential backoff

parent dfe73eb4
...@@ -61,7 +61,6 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract ...@@ -61,7 +61,6 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
statusTicker = new StatusTicker(); statusTicker = new StatusTicker();
pane = (SlidingPaneLayout) findViewById(R.id.sliding_pane); pane = (SlidingPaneLayout) findViewById(R.id.sliding_pane);
setupToolbar(); setupToolbar();
closeSidebarIfNeeded();
} }
@Override @Override
...@@ -139,6 +138,7 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract ...@@ -139,6 +138,7 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
}); });
} }
} }
closeSidebarIfNeeded();
} }
private boolean closeSidebarIfNeeded() { private boolean closeSidebarIfNeeded() {
......
...@@ -185,7 +185,6 @@ import rx.subjects.PublishSubject; ...@@ -185,7 +185,6 @@ import rx.subjects.PublishSubject;
} }
return connectToServer(hostname); return connectToServer(hostname);
// .retryWhen(RxHelper.exponentialBackoff(1, 500, TimeUnit.MILLISECONDS));
}); });
} }
......
...@@ -122,7 +122,7 @@ public class RocketChatWebSocketThread extends HandlerThread { ...@@ -122,7 +122,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
} }
}.start(); }.start();
}).flatMap(webSocket -> }).flatMap(webSocket ->
webSocket.connect().map(_val -> webSocket)); webSocket.connectWithExponentialBackoff().map(_val -> webSocket));
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment