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
5b82789d
Commit
5b82789d
authored
Dec 19, 2016
by
Tiago Cunha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some typos
parent
92a70c60
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
12 deletions
+12
-12
AbstractAuthedActivity.java
.../chat/rocket/android/activity/AbstractAuthedActivity.java
+1
-1
ServerConfigActivity.java
...va/chat/rocket/android/activity/ServerConfigActivity.java
+1
-1
RoomFragment.java
...a/chat/rocket/android/fragment/chatroom/RoomFragment.java
+2
-2
UsersOfRoomDialogFragment.java
...d/fragment/chatroom/dialog/UsersOfRoomDialogFragment.java
+1
-1
ServerConfig.java
...src/main/java/chat/rocket/android/model/ServerConfig.java
+1
-1
MethodCall.java
...n/java/chat/rocket/android/model/internal/MethodCall.java
+5
-5
RocketChatService.java
...n/java/chat/rocket/android/service/RocketChatService.java
+1
-1
No files found.
app/src/main/java/chat/rocket/android/activity/AbstractAuthedActivity.java
View file @
5b82789d
...
...
@@ -128,7 +128,7 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
@Override
protected
void
onResume
()
{
super
.
onResume
();
RocketChatService
.
keep
a
live
(
this
);
RocketChatService
.
keep
A
live
(
this
);
unconfiguredServersObserver
.
sub
();
SharedPreferences
prefs
=
RocketChatCache
.
get
(
this
);
...
...
app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java
View file @
5b82789d
...
...
@@ -65,7 +65,7 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
@Override
protected
void
onResume
()
{
super
.
onResume
();
RocketChatService
.
keep
a
live
(
this
);
RocketChatService
.
keep
A
live
(
this
);
serverConfigErrorObserver
.
sub
();
}
...
...
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java
View file @
5b82789d
...
...
@@ -313,7 +313,7 @@ public class RoomFragment extends AbstractChatRoomFragment
.
put
(
"reset"
,
true
));
return
null
;
}).
onSuccessTask
(
task
->
{
RocketChatService
.
keep
a
live
(
getContext
());
RocketChatService
.
keep
A
live
(
getContext
());
return
task
;
}).
continueWith
(
new
LogcatIfError
());
}
...
...
@@ -334,7 +334,7 @@ public class RoomFragment extends AbstractChatRoomFragment
}
return
null
;
}).
onSuccessTask
(
task
->
{
RocketChatService
.
keep
a
live
(
getContext
());
RocketChatService
.
keep
A
live
(
getContext
());
return
task
;
}).
continueWith
(
new
LogcatIfError
());
}
...
...
app/src/main/java/chat/rocket/android/fragment/chatroom/dialog/UsersOfRoomDialogFragment.java
View file @
5b82789d
...
...
@@ -91,7 +91,7 @@ public class UsersOfRoomDialogFragment extends AbstractChatroomDialogFragment {
.
put
(
"showAll"
,
true
));
return
null
;
}).
onSuccessTask
(
task
->
{
RocketChatService
.
keep
a
live
(
getContext
());
RocketChatService
.
keep
A
live
(
getContext
());
return
task
;
}).
continueWith
(
new
LogcatIfError
());
}
...
...
app/src/main/java/chat/rocket/android/model/ServerConfig.java
View file @
5b82789d
...
...
@@ -25,7 +25,7 @@ public class ServerConfig extends RealmObject {
private
String
error
;
/**
* Log the server connection is lost due to so
em
exception.
* Log the server connection is lost due to so
me
exception.
*/
@DebugLog
public
static
void
logConnectionError
(
String
serverConfigId
,
Exception
exception
)
{
...
...
app/src/main/java/chat/rocket/android/model/internal/MethodCall.java
View file @
5b82789d
...
...
@@ -58,9 +58,9 @@ public class MethodCall extends RealmObject {
return
;
}
int
sync
s
tate
=
methodCall
.
getSyncState
();
RCLog
.
d
(
"MethodCall[%s] syncstate=%d"
,
methodCall
.
getMethodCallId
(),
sync
s
tate
);
if
(
sync
s
tate
==
SyncState
.
SYNCED
)
{
int
sync
S
tate
=
methodCall
.
getSyncState
();
RCLog
.
d
(
"MethodCall[%s] syncstate=%d"
,
methodCall
.
getMethodCallId
(),
sync
S
tate
);
if
(
sync
S
tate
==
SyncState
.
SYNCED
)
{
String
resultJson
=
methodCall
.
getResultJson
();
if
(
TextUtils
.
isEmpty
(
resultJson
))
{
task
.
setResult
(
null
);
...
...
@@ -70,7 +70,7 @@ public class MethodCall extends RealmObject {
observer
.
unsub
();
REF_MAP
.
remove
(
methodCall
.
getMethodCallId
());
remove
(
realmHelper
,
methodCall
.
getMethodCallId
()).
continueWith
(
new
LogcatIfError
());
}
else
if
(
sync
s
tate
==
SyncState
.
FAILED
)
{
}
else
if
(
sync
S
tate
==
SyncState
.
FAILED
)
{
task
.
setError
(
new
Error
(
methodCall
.
getResultJson
()));
observer
.
unsub
();
REF_MAP
.
remove
(
methodCall
.
getMethodCallId
());
...
...
@@ -81,7 +81,7 @@ public class MethodCall extends RealmObject {
REF_MAP
.
put
(
newId
,
observer
);
if
(
context
!=
null
)
{
RocketChatService
.
keep
a
live
(
context
);
RocketChatService
.
keep
A
live
(
context
);
}
}
return
null
;
...
...
app/src/main/java/chat/rocket/android/service/RocketChatService.java
View file @
5b82789d
...
...
@@ -28,7 +28,7 @@ public class RocketChatService extends Service {
/**
* ensure RocketChatService alive.
*/
public
static
void
keep
a
live
(
Context
context
)
{
public
static
void
keep
A
live
(
Context
context
)
{
context
.
startService
(
new
Intent
(
context
,
RocketChatService
.
class
));
}
...
...
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