Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
4d2c6aa6
Commit
4d2c6aa6
authored
Nov 07, 2017
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Close sidebar on proper location; server first connect with exponential backoff
parent
dfe73eb4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
MainActivity.java
.../main/java/chat/rocket/android/activity/MainActivity.java
+1
-1
RealmBasedConnectivityManager.java
...rocket/android/service/RealmBasedConnectivityManager.java
+0
-1
RocketChatWebSocketThread.java
...hat/rocket/android/service/RocketChatWebSocketThread.java
+1
-1
No files found.
app/src/main/java/chat/rocket/android/activity/MainActivity.java
View file @
4d2c6aa6
...
@@ -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
()
{
...
...
app/src/main/java/chat/rocket/android/service/RealmBasedConnectivityManager.java
View file @
4d2c6aa6
...
@@ -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));
});
});
}
}
...
...
app/src/main/java/chat/rocket/android/service/RocketChatWebSocketThread.java
View file @
4d2c6aa6
...
@@ -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
.
connect
WithExponentialBackoff
().
map
(
_val
->
webSocket
));
}
}
@Override
@Override
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment