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
86ca95ee
Commit
86ca95ee
authored
Nov 27, 2017
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retry connection if socket thread looper not yet prepared
parent
95e1741f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
MainActivity.java
.../main/java/chat/rocket/android/activity/MainActivity.java
+1
-0
MainPresenter.java
...main/java/chat/rocket/android/activity/MainPresenter.java
+0
-2
ConnectivityManagerInternal.java
...t/rocket/android/service/ConnectivityManagerInternal.java
+0
-4
RealmBasedConnectivityManager.java
...rocket/android/service/RealmBasedConnectivityManager.java
+8
-1
No files found.
app/src/main/java/chat/rocket/android/activity/MainActivity.java
View file @
86ca95ee
...
...
@@ -251,6 +251,7 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
@Override
public
synchronized
void
showConnectionError
()
{
System
.
out
.
println
(
"ERROR"
);
dismissStatusTickerIfShowing
();
statusTicker
=
Snackbar
.
make
(
findViewById
(
getLayoutContainerForFragment
()),
R
.
string
.
fragment_retry_login_error_title
,
Snackbar
.
LENGTH_INDEFINITE
)
...
...
app/src/main/java/chat/rocket/android/activity/MainPresenter.java
View file @
86ca95ee
...
...
@@ -230,8 +230,6 @@ public class MainPresenter extends BasePresenter<MainContract.View>
}
else
if
(
connectivity
.
state
==
ServerConnectivity
.
STATE_DISCONNECTED
)
{
if
(
connectivity
.
code
==
DDPClient
.
REASON_NETWORK_ERROR
)
{
view
.
showConnectionError
();
}
else
{
view
.
showConnectionOk
();
}
}
else
{
view
.
showConnecting
();
...
...
app/src/main/java/chat/rocket/android/service/ConnectivityManagerInternal.java
View file @
86ca95ee
...
...
@@ -8,10 +8,6 @@ import chat.rocket.core.models.ServerInfo;
* interfaces used for RocketChatService and RocketChatwebSocketThread.
*/
/*package*/
interface
ConnectivityManagerInternal
{
int
REASON_CLOSED_BY_USER
=
101
;
int
REASON_NETWORK_ERROR
=
102
;
int
REASON_SERVER_ERROR
=
103
;
int
REASON_UNKNOWN
=
104
;
void
resetConnectivityStateList
();
...
...
app/src/main/java/chat/rocket/android/service/RealmBasedConnectivityManager.java
View file @
86ca95ee
...
...
@@ -195,6 +195,7 @@ import io.reactivex.subjects.BehaviorSubject;
}
return
connectToServer
(
hostname
)
.
retry
(
exception
->
exception
instanceof
ThreadLooperNotPreparedException
)
.
onErrorResumeNext
(
Single
.
just
(
false
));
});
}
...
...
@@ -264,7 +265,7 @@ import io.reactivex.subjects.BehaviorSubject;
if
(
serviceInterface
!=
null
)
{
return
serviceInterface
.
ensureConnectionToServer
(
hostname
);
}
else
{
return
Single
.
error
(
new
IllegalState
Exception
(
"not prepared"
));
return
Single
.
error
(
new
ThreadLooperNotPrepared
Exception
(
"not prepared"
));
}
});
}
...
...
@@ -285,4 +286,10 @@ import io.reactivex.subjects.BehaviorSubject;
}
});
}
private
static
class
ThreadLooperNotPreparedException
extends
IllegalStateException
{
ThreadLooperNotPreparedException
(
String
message
)
{
super
(
message
);
}
}
}
\ No newline at end of file
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