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
772b55bd
Commit
772b55bd
authored
Feb 13, 2017
by
Tiago Cunha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Almost done with room fragment
parent
8d9d67ea
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
427 additions
and
228 deletions
+427
-228
LoginActivity.java
...main/java/chat/rocket/android/activity/LoginActivity.java
+4
-4
MainActivity.java
.../main/java/chat/rocket/android/activity/MainActivity.java
+36
-14
MainContract.java
.../main/java/chat/rocket/android/activity/MainContract.java
+18
-0
MainPresenter.java
...main/java/chat/rocket/android/activity/MainPresenter.java
+33
-0
MethodCallHelper.java
...c/main/java/chat/rocket/android/api/MethodCallHelper.java
+6
-6
DefaultCookieProvider.java
...a/chat/rocket/android/api/rest/DefaultCookieProvider.java
+3
-3
RoomContract.java
...a/chat/rocket/android/fragment/chatroom/RoomContract.java
+10
-8
RoomFragment.java
...a/chat/rocket/android/fragment/chatroom/RoomFragment.java
+35
-73
RoomPresenter.java
.../chat/rocket/android/fragment/chatroom/RoomPresenter.java
+33
-31
RetryLoginFragment.java
...et/android/fragment/server_config/RetryLoginFragment.java
+4
-4
SidebarMainContract.java
.../rocket/android/fragment/sidebar/SidebarMainContract.java
+3
-7
SidebarMainPresenter.java
...rocket/android/fragment/sidebar/SidebarMainPresenter.java
+7
-16
AbstractMessageViewHolder.java
...roid/layouthelper/chatroom/AbstractMessageViewHolder.java
+1
-5
MessageListAdapter.java
...ket/android/layouthelper/chatroom/MessageListAdapter.java
+4
-8
MessageNormalViewHolder.java
...ndroid/layouthelper/chatroom/MessageNormalViewHolder.java
+3
-3
MessageSystemViewHolder.java
...ndroid/layouthelper/chatroom/MessageSystemViewHolder.java
+2
-2
MessageRenderer.java
...in/java/chat/rocket/android/renderer/MessageRenderer.java
+1
-1
RealmBasedConnectivityManager.java
...rocket/android/service/RealmBasedConnectivityManager.java
+9
-5
RocketChatWebSocketThread.java
...hat/rocket/android/service/RocketChatWebSocketThread.java
+5
-5
FileUploadingWithUfsObserver.java
...ndroid/service/observer/FileUploadingWithUfsObserver.java
+3
-3
SessionObserver.java
...chat/rocket/android/service/observer/SessionObserver.java
+8
-8
TokenLoginObserver.java
...t/rocket/android/service/observer/TokenLoginObserver.java
+9
-9
BaseContract.java
...rc/main/java/chat/rocket/android/shared/BaseContract.java
+15
-0
BasePresenter.java
...c/main/java/chat/rocket/android/shared/BasePresenter.java
+28
-0
RealmSession.java
...ocket/persistence/realm/models/internal/RealmSession.java
+19
-9
RealmSessionRepository.java
...ersistence/realm/repositories/RealmSessionRepository.java
+48
-0
RealmUserRepository.java
...t/persistence/realm/repositories/RealmUserRepository.java
+1
-1
build.gradle
rocket-chat-core/build.gradle
+3
-2
CanCreateRoomInteractor.java
...chat/rocket/core/interactors/CanCreateRoomInteractor.java
+29
-0
Session.java
...t-core/src/main/java/chat/rocket/core/models/Session.java
+37
-0
SessionRepository.java
...java/chat/rocket/core/repositories/SessionRepository.java
+9
-0
UserRepository.java
...in/java/chat/rocket/core/repositories/UserRepository.java
+1
-1
No files found.
app/src/main/java/chat/rocket/android/activity/LoginActivity.java
View file @
772b55bd
...
@@ -9,7 +9,7 @@ import chat.rocket.android.R;
...
@@ -9,7 +9,7 @@ import chat.rocket.android.R;
import
chat.rocket.android.fragment.server_config.LoginFragment
;
import
chat.rocket.android.fragment.server_config.LoginFragment
;
import
chat.rocket.android.fragment.server_config.RetryLoginFragment
;
import
chat.rocket.android.fragment.server_config.RetryLoginFragment
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmObjectObserver
;
import
chat.rocket.persistence.realm.RealmObjectObserver
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.android.service.ConnectivityManager
;
import
chat.rocket.android.service.ConnectivityManager
;
...
@@ -21,7 +21,7 @@ public class LoginActivity extends AbstractFragmentActivity {
...
@@ -21,7 +21,7 @@ public class LoginActivity extends AbstractFragmentActivity {
public
static
final
String
KEY_HOSTNAME
=
"hostname"
;
public
static
final
String
KEY_HOSTNAME
=
"hostname"
;
private
String
hostname
;
private
String
hostname
;
private
RealmObjectObserver
<
Session
>
sessionObserver
;
private
RealmObjectObserver
<
Realm
Session
>
sessionObserver
;
@Override
@Override
protected
int
getLayoutContainerForFragment
()
{
protected
int
getLayoutContainerForFragment
()
{
...
@@ -45,7 +45,7 @@ public class LoginActivity extends AbstractFragmentActivity {
...
@@ -45,7 +45,7 @@ public class LoginActivity extends AbstractFragmentActivity {
}
}
sessionObserver
=
RealmStore
.
get
(
hostname
)
sessionObserver
=
RealmStore
.
get
(
hostname
)
.
createObjectObserver
(
Session:
:
queryDefaultSession
)
.
createObjectObserver
(
Realm
Session:
:
queryDefaultSession
)
.
setOnUpdateListener
(
this
::
onRenderServerConfigSession
);
.
setOnUpdateListener
(
this
::
onRenderServerConfigSession
);
setContentView
(
R
.
layout
.
simple_screen
);
setContentView
(
R
.
layout
.
simple_screen
);
...
@@ -65,7 +65,7 @@ public class LoginActivity extends AbstractFragmentActivity {
...
@@ -65,7 +65,7 @@ public class LoginActivity extends AbstractFragmentActivity {
super
.
onDestroy
();
super
.
onDestroy
();
}
}
private
void
onRenderServerConfigSession
(
Session
session
)
{
private
void
onRenderServerConfigSession
(
Realm
Session
session
)
{
if
(
session
==
null
)
{
if
(
session
==
null
)
{
return
;
return
;
}
}
...
...
app/src/main/java/chat/rocket/android/activity/MainActivity.java
View file @
772b55bd
...
@@ -17,27 +17,32 @@ import chat.rocket.android.fragment.chatroom.RoomFragment;
...
@@ -17,27 +17,32 @@ import chat.rocket.android.fragment.chatroom.RoomFragment;
import
chat.rocket.android.fragment.sidebar.SidebarMainFragment
;
import
chat.rocket.android.fragment.sidebar.SidebarMainFragment
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.core.interactors.CanCreateRoomInteractor
;
import
chat.rocket.persistence.realm.models.ddp.RealmRoom
;
import
chat.rocket.persistence.realm.models.ddp.RealmRoom
;
import
chat.rocket.persistence.realm.models.ddp.RealmUser
;
import
chat.rocket.persistence.realm.models.ddp.RealmUser
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmListObserver
;
import
chat.rocket.persistence.realm.RealmListObserver
;
import
chat.rocket.persistence.realm.RealmObjectObserver
;
import
chat.rocket.persistence.realm.RealmObjectObserver
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.android.service.ConnectivityManager
;
import
chat.rocket.android.service.ConnectivityManager
;
import
chat.rocket.android.widget.RoomToolbar
;
import
chat.rocket.android.widget.RoomToolbar
;
import
chat.rocket.persistence.realm.repositories.RealmSessionRepository
;
import
chat.rocket.persistence.realm.repositories.RealmUserRepository
;
import
hugo.weaving.DebugLog
;
import
hugo.weaving.DebugLog
;
/**
/**
* Entry-point for Rocket.Chat.Android application.
* Entry-point for Rocket.Chat.Android application.
*/
*/
public
class
MainActivity
extends
AbstractAuthedActivity
{
public
class
MainActivity
extends
AbstractAuthedActivity
implements
MainContract
.
View
{
private
RealmObjectObserver
<
Session
>
sessionObserver
;
private
RealmObjectObserver
<
Realm
Session
>
sessionObserver
;
private
RealmListObserver
<
RealmRoom
>
unreadRoomSubscriptionObserver
;
private
RealmListObserver
<
RealmRoom
>
unreadRoomSubscriptionObserver
;
private
boolean
isForeground
;
private
boolean
isForeground
;
private
StatusTicker
statusTicker
;
private
StatusTicker
statusTicker
;
private
MainContract
.
Presenter
presenter
;
@Override
@Override
protected
int
getLayoutContainerForFragment
()
{
protected
int
getLayoutContainerForFragment
()
{
return
R
.
id
.
activity_main_container
;
return
R
.
id
.
activity_main_container
;
...
@@ -70,11 +75,13 @@ public class MainActivity extends AbstractAuthedActivity {
...
@@ -70,11 +75,13 @@ public class MainActivity extends AbstractAuthedActivity {
protected
void
onResume
()
{
protected
void
onResume
()
{
isForeground
=
true
;
isForeground
=
true
;
super
.
onResume
();
super
.
onResume
();
presenter
.
bindView
(
this
);
}
}
@Override
@Override
protected
void
onPause
()
{
protected
void
onPause
()
{
isForeground
=
false
;
isForeground
=
false
;
presenter
.
release
();
super
.
onPause
();
super
.
onPause
();
}
}
...
@@ -162,6 +169,16 @@ public class MainActivity extends AbstractAuthedActivity {
...
@@ -162,6 +169,16 @@ public class MainActivity extends AbstractAuthedActivity {
@Override
@Override
protected
void
onHostnameUpdated
()
{
protected
void
onHostnameUpdated
()
{
super
.
onHostnameUpdated
();
super
.
onHostnameUpdated
();
if
(
presenter
!=
null
)
{
presenter
.
release
();
}
CanCreateRoomInteractor
interactor
=
new
CanCreateRoomInteractor
(
new
RealmUserRepository
(
hostname
),
new
RealmSessionRepository
(
hostname
)
);
presenter
=
new
MainPresenter
(
interactor
);
updateSessionObserver
();
updateSessionObserver
();
updateUnreadRoomSubscriptionObserver
();
updateUnreadRoomSubscriptionObserver
();
updateSidebarMainFragment
();
updateSidebarMainFragment
();
...
@@ -184,13 +201,13 @@ public class MainActivity extends AbstractAuthedActivity {
...
@@ -184,13 +201,13 @@ public class MainActivity extends AbstractAuthedActivity {
sessionObserver
=
realmHelper
sessionObserver
=
realmHelper
.
createObjectObserver
(
realm
->
.
createObjectObserver
(
realm
->
Session
.
queryDefaultSession
(
realm
)
Realm
Session
.
queryDefaultSession
(
realm
)
.
isNotNull
(
Session
.
TOKEN
))
.
isNotNull
(
Realm
Session
.
TOKEN
))
.
setOnUpdateListener
(
this
::
onSessionChanged
);
.
setOnUpdateListener
(
this
::
onSessionChanged
);
sessionObserver
.
sub
();
sessionObserver
.
sub
();
}
}
private
void
onSessionChanged
(
@Nullable
Session
session
)
{
private
void
onSessionChanged
(
@Nullable
Realm
Session
session
)
{
if
(
session
==
null
)
{
if
(
session
==
null
)
{
if
(
isForeground
)
{
if
(
isForeground
)
{
LaunchUtil
.
showLoginActivity
(
this
,
hostname
);
LaunchUtil
.
showLoginActivity
(
this
,
hostname
);
...
@@ -201,7 +218,7 @@ public class MainActivity extends AbstractAuthedActivity {
...
@@ -201,7 +218,7 @@ public class MainActivity extends AbstractAuthedActivity {
Snackbar
.
make
(
findViewById
(
getLayoutContainerForFragment
()),
Snackbar
.
make
(
findViewById
(
getLayoutContainerForFragment
()),
R
.
string
.
fragment_retry_login_error_title
,
Snackbar
.
LENGTH_INDEFINITE
)
R
.
string
.
fragment_retry_login_error_title
,
Snackbar
.
LENGTH_INDEFINITE
)
.
setAction
(
R
.
string
.
fragment_retry_login_retry_title
,
view
->
.
setAction
(
R
.
string
.
fragment_retry_login_retry_title
,
view
->
Session
.
retryLogin
(
RealmStore
.
get
(
hostname
))));
Realm
Session
.
retryLogin
(
RealmStore
.
get
(
hostname
))));
}
else
if
(!
session
.
isTokenVerified
())
{
}
else
if
(!
session
.
isTokenVerified
())
{
statusTicker
.
updateStatus
(
StatusTicker
.
STATUS_TOKEN_LOGIN
,
statusTicker
.
updateStatus
(
StatusTicker
.
STATUS_TOKEN_LOGIN
,
Snackbar
.
make
(
findViewById
(
getLayoutContainerForFragment
()),
Snackbar
.
make
(
findViewById
(
getLayoutContainerForFragment
()),
...
@@ -258,13 +275,7 @@ public class MainActivity extends AbstractAuthedActivity {
...
@@ -258,13 +275,7 @@ public class MainActivity extends AbstractAuthedActivity {
@Override
@Override
protected
void
onRoomIdUpdated
()
{
protected
void
onRoomIdUpdated
()
{
super
.
onRoomIdUpdated
();
super
.
onRoomIdUpdated
();
presenter
.
onOpenRoom
(
hostname
,
roomId
);
if
(
roomId
!=
null
&&
RoomFragment
.
canCreate
(
RealmStore
.
get
(
hostname
)))
{
showFragment
(
RoomFragment
.
create
(
hostname
,
roomId
));
closeSidebarIfNeeded
();
}
else
{
showFragment
(
new
HomeFragment
());
}
}
}
@Override
@Override
...
@@ -285,6 +296,17 @@ public class MainActivity extends AbstractAuthedActivity {
...
@@ -285,6 +296,17 @@ public class MainActivity extends AbstractAuthedActivity {
return
closeSidebarIfNeeded
()
||
super
.
onBackPress
();
return
closeSidebarIfNeeded
()
||
super
.
onBackPress
();
}
}
@Override
public
void
showHome
()
{
showFragment
(
new
HomeFragment
());
}
@Override
public
void
showRoom
(
String
hostname
,
String
roomId
)
{
showFragment
(
RoomFragment
.
create
(
hostname
,
roomId
));
closeSidebarIfNeeded
();
}
//TODO: consider this class to define in layouthelper for more complicated operation.
//TODO: consider this class to define in layouthelper for more complicated operation.
private
static
class
StatusTicker
{
private
static
class
StatusTicker
{
public
static
final
int
STATUS_DISMISS
=
0
;
public
static
final
int
STATUS_DISMISS
=
0
;
...
...
app/src/main/java/chat/rocket/android/activity/MainContract.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
android
.
activity
;
import
chat.rocket.android.shared.BaseContract
;
public
interface
MainContract
{
interface
View
extends
BaseContract
.
View
{
void
showHome
();
void
showRoom
(
String
hostname
,
String
roomId
);
}
interface
Presenter
extends
BaseContract
.
Presenter
<
View
>
{
void
onOpenRoom
(
String
hostname
,
String
roomId
);
}
}
app/src/main/java/chat/rocket/android/activity/MainPresenter.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
android
.
activity
;
import
chat.rocket.android.BackgroundLooper
;
import
chat.rocket.android.shared.BasePresenter
;
import
chat.rocket.core.interactors.CanCreateRoomInteractor
;
import
rx.Subscription
;
import
rx.android.schedulers.AndroidSchedulers
;
public
class
MainPresenter
extends
BasePresenter
<
MainContract
.
View
>
implements
MainContract
.
Presenter
{
private
final
CanCreateRoomInteractor
canCreateRoomInteractor
;
public
MainPresenter
(
CanCreateRoomInteractor
canCreateRoomInteractor
)
{
this
.
canCreateRoomInteractor
=
canCreateRoomInteractor
;
}
@Override
public
void
onOpenRoom
(
String
hostname
,
String
roomId
)
{
final
Subscription
subscription
=
canCreateRoomInteractor
.
canCreate
(
roomId
)
.
subscribeOn
(
AndroidSchedulers
.
from
(
BackgroundLooper
.
get
()))
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
allowed
->
{
if
(
allowed
)
{
view
.
showRoom
(
hostname
,
roomId
);
}
else
{
view
.
showHome
();
}
});
addSubscription
(
subscription
);
}
}
app/src/main/java/chat/rocket/android/api/MethodCallHelper.java
View file @
772b55bd
...
@@ -17,7 +17,7 @@ import chat.rocket.core.SyncState;
...
@@ -17,7 +17,7 @@ import chat.rocket.core.SyncState;
import
chat.rocket.persistence.realm.models.ddp.RealmMessage
;
import
chat.rocket.persistence.realm.models.ddp.RealmMessage
;
import
chat.rocket.persistence.realm.models.ddp.RealmRoom
;
import
chat.rocket.persistence.realm.models.ddp.RealmRoom
;
import
chat.rocket.persistence.realm.models.internal.MethodCall
;
import
chat.rocket.persistence.realm.models.internal.MethodCall
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.android.service.DDPClientRef
;
import
chat.rocket.android.service.DDPClientRef
;
...
@@ -44,7 +44,7 @@ public class MethodCallHelper {
...
@@ -44,7 +44,7 @@ public class MethodCallHelper {
* initialize with Context and hostname.
* initialize with Context and hostname.
*/
*/
public
MethodCallHelper
(
Context
context
,
String
hostname
)
{
public
MethodCallHelper
(
Context
context
,
String
hostname
)
{
this
.
context
=
context
;
this
.
context
=
context
.
getApplicationContext
()
;
this
.
realmHelper
=
RealmStore
.
get
(
hostname
);
this
.
realmHelper
=
RealmStore
.
get
(
hostname
);
ddpClientRef
=
null
;
ddpClientRef
=
null
;
}
}
...
@@ -126,8 +126,8 @@ public class MethodCallHelper {
...
@@ -126,8 +126,8 @@ public class MethodCallHelper {
private
Task
<
Void
>
saveToken
(
Task
<
String
>
task
)
{
private
Task
<
Void
>
saveToken
(
Task
<
String
>
task
)
{
return
realmHelper
.
executeTransaction
(
realm
->
return
realmHelper
.
executeTransaction
(
realm
->
realm
.
createOrUpdateObjectFromJson
(
Session
.
class
,
new
JSONObject
()
realm
.
createOrUpdateObjectFromJson
(
Realm
Session
.
class
,
new
JSONObject
()
.
put
(
"sessionId"
,
Session
.
DEFAULT_ID
)
.
put
(
"sessionId"
,
Realm
Session
.
DEFAULT_ID
)
.
put
(
"token"
,
task
.
getResult
())
.
put
(
"token"
,
task
.
getResult
())
.
put
(
"tokenVerified"
,
true
)
.
put
(
"tokenVerified"
,
true
)
.
put
(
"error"
,
JSONObject
.
NULL
)
.
put
(
"error"
,
JSONObject
.
NULL
)
...
@@ -191,7 +191,7 @@ public class MethodCallHelper {
...
@@ -191,7 +191,7 @@ public class MethodCallHelper {
.
onSuccessTask
(
this
::
saveToken
)
.
onSuccessTask
(
this
::
saveToken
)
.
continueWithTask
(
task
->
{
.
continueWithTask
(
task
->
{
if
(
task
.
isFaulted
())
{
if
(
task
.
isFaulted
())
{
Session
.
logError
(
realmHelper
,
task
.
getError
());
Realm
Session
.
logError
(
realmHelper
,
task
.
getError
());
}
}
return
task
;
return
task
;
});
});
...
@@ -203,7 +203,7 @@ public class MethodCallHelper {
...
@@ -203,7 +203,7 @@ public class MethodCallHelper {
public
Task
<
Void
>
logout
()
{
public
Task
<
Void
>
logout
()
{
return
call
(
"logout"
,
TIMEOUT_MS
).
onSuccessTask
(
task
->
return
call
(
"logout"
,
TIMEOUT_MS
).
onSuccessTask
(
task
->
realmHelper
.
executeTransaction
(
realm
->
{
realmHelper
.
executeTransaction
(
realm
->
{
realm
.
delete
(
Session
.
class
);
realm
.
delete
(
Realm
Session
.
class
);
return
null
;
return
null
;
}));
}));
}
}
...
...
app/src/main/java/chat/rocket/android/api/rest/DefaultCookieProvider.java
View file @
772b55bd
...
@@ -4,7 +4,7 @@ import android.content.Context;
...
@@ -4,7 +4,7 @@ import android.content.Context;
import
chat.rocket.android.RocketChatCache
;
import
chat.rocket.android.RocketChatCache
;
import
chat.rocket.persistence.realm.models.ddp.RealmUser
;
import
chat.rocket.persistence.realm.models.ddp.RealmUser
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.RealmStore
;
...
@@ -35,8 +35,8 @@ public class DefaultCookieProvider implements CookieProvider {
...
@@ -35,8 +35,8 @@ public class DefaultCookieProvider implements CookieProvider {
final
RealmUser
user
=
realmHelper
.
executeTransactionForRead
(
realm
->
final
RealmUser
user
=
realmHelper
.
executeTransactionForRead
(
realm
->
RealmUser
.
queryCurrentUser
(
realm
).
findFirst
());
RealmUser
.
queryCurrentUser
(
realm
).
findFirst
());
final
Session
session
=
realmHelper
.
executeTransactionForRead
(
realm
->
final
Realm
Session
session
=
realmHelper
.
executeTransactionForRead
(
realm
->
Session
.
queryDefaultSession
(
realm
).
findFirst
());
Realm
Session
.
queryDefaultSession
(
realm
).
findFirst
());
if
(
user
==
null
||
session
==
null
)
{
if
(
user
==
null
||
session
==
null
)
{
return
""
;
return
""
;
...
...
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomContract.java
View file @
772b55bd
package
chat
.
rocket
.
android
.
fragment
.
chatroom
;
package
chat
.
rocket
.
android
.
fragment
.
chatroom
;
import
android.support.annotation.N
onNull
;
import
android.support.annotation.N
ullable
;
import
java.util.List
;
import
java.util.List
;
import
chat.rocket.android.shared.BaseContract
;
import
chat.rocket.core.models.Message
;
import
chat.rocket.core.models.Message
;
import
chat.rocket.core.models.Room
;
import
chat.rocket.core.models.Room
;
public
interface
RoomContract
{
public
interface
RoomContract
{
interface
View
{
interface
View
extends
BaseContract
.
View
{
void
render
(
Room
room
);
void
render
(
Room
room
);
...
@@ -19,22 +20,23 @@ public interface RoomContract {
...
@@ -19,22 +20,23 @@ public interface RoomContract {
void
showUnreadCount
(
int
count
);
void
showUnreadCount
(
int
count
);
void
showMessages
(
List
<
Message
>
messages
);
void
showMessages
(
List
<
Message
>
messages
);
}
interface
Presenter
{
void
showMessageSendFailure
(
Message
message
);
void
bindView
(
@NonNull
View
view
);
}
void
release
();
interface
Presenter
extends
BaseContract
.
Presenter
<
View
>
{
void
loadMessages
();
void
loadMessages
();
void
loadMoreMessages
();
void
loadMoreMessages
();
void
onMessageSelected
(
@Nullable
Message
message
);
void
sendMessage
(
String
messageText
);
void
sendMessage
(
String
messageText
);
void
resendMessage
(
String
messageId
);
void
resendMessage
(
Message
message
);
void
deleteMessage
(
String
messageId
);
void
deleteMessage
(
Message
message
);
void
onUnreadCount
();
void
onUnreadCount
();
...
...
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java
View file @
772b55bd
...
@@ -45,16 +45,11 @@ import chat.rocket.android.layouthelper.extra_action.upload.AudioUploadActionIte
...
@@ -45,16 +45,11 @@ import chat.rocket.android.layouthelper.extra_action.upload.AudioUploadActionIte
import
chat.rocket.android.layouthelper.extra_action.upload.ImageUploadActionItem
;
import
chat.rocket.android.layouthelper.extra_action.upload.ImageUploadActionItem
;
import
chat.rocket.android.layouthelper.extra_action.upload.VideoUploadActionItem
;
import
chat.rocket.android.layouthelper.extra_action.upload.VideoUploadActionItem
;
import
chat.rocket.android.log.RCLog
;
import
chat.rocket.android.log.RCLog
;
import
chat.rocket.core.SyncState
;
import
chat.rocket.core.models.Message
;
import
chat.rocket.core.models.Message
;
import
chat.rocket.core.models.Room
;
import
chat.rocket.core.models.Room
;
import
chat.rocket.persistence.realm.models.ddp.RealmRoom
;
import
chat.rocket.persistence.realm.models.ddp.RealmUser
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.repositories.RealmMessageRepository
;
import
chat.rocket.persistence.realm.repositories.RealmMessageRepository
;
import
chat.rocket.persistence.realm.repositories.RealmRoomRepository
;
import
chat.rocket.persistence.realm.repositories.RealmRoomRepository
;
import
chat.rocket.persistence.realm.repositories.RealmUserRepository
;
import
chat.rocket.persistence.realm.repositories.RealmUserRepository
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.android.layouthelper.chatroom.ModelListAdapter
;
import
chat.rocket.android.layouthelper.chatroom.ModelListAdapter
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.android.service.ConnectivityManager
;
import
chat.rocket.android.service.ConnectivityManager
;
...
@@ -76,10 +71,7 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -76,10 +71,7 @@ public class RoomFragment extends AbstractChatRoomFragment
private
static
final
String
ROOM_ID
=
"roomId"
;
private
static
final
String
ROOM_ID
=
"roomId"
;
private
String
hostname
;
private
String
hostname
;
private
RealmHelper
realmHelper
;
private
String
roomId
;
private
String
roomId
;
private
String
userId
;
private
String
token
;
private
LoadMoreScrollListener
scrollListener
;
private
LoadMoreScrollListener
scrollListener
;
private
MessageFormManager
messageFormManager
;
private
MessageFormManager
messageFormManager
;
private
RecyclerViewAutoScrollManager
autoScrollManager
;
private
RecyclerViewAutoScrollManager
autoScrollManager
;
...
@@ -95,14 +87,6 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -95,14 +87,6 @@ public class RoomFragment extends AbstractChatRoomFragment
public
RoomFragment
()
{
public
RoomFragment
()
{
}
}
public
static
boolean
canCreate
(
RealmHelper
realmHelper
)
{
RealmUser
currentUser
=
realmHelper
.
executeTransactionForRead
(
realm
->
RealmUser
.
queryCurrentUser
(
realm
).
findFirst
());
Session
session
=
realmHelper
.
executeTransactionForRead
(
realm
->
Session
.
queryDefaultSession
(
realm
).
findFirst
());
return
currentUser
!=
null
&&
session
!=
null
;
}
/**
/**
* create fragment with roomId.
* create fragment with roomId.
*/
*/
...
@@ -131,19 +115,11 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -131,19 +115,11 @@ public class RoomFragment extends AbstractChatRoomFragment
new
RealmRoomRepository
(
hostname
),
new
RealmRoomRepository
(
hostname
),
new
RealmMessageRepository
(
hostname
),
new
RealmMessageRepository
(
hostname
),
new
MethodCallHelper
(
getContext
(),
hostname
),
new
MethodCallHelper
(
getContext
(),
hostname
),
ConnectivityManager
.
getInstance
(
getContext
()
.
getApplicationContext
()
)
ConnectivityManager
.
getInstance
(
getContext
())
);
);
realmHelper
=
RealmStore
.
get
(
hostname
);
userId
=
realmHelper
.
executeTransactionForRead
(
realm
->
RealmUser
.
queryCurrentUser
(
realm
).
findFirst
()).
getId
();
token
=
realmHelper
.
executeTransactionForRead
(
realm
->
Session
.
queryDefaultSession
(
realm
).
findFirst
()).
getToken
();
if
(
savedInstanceState
==
null
)
{
if
(
savedInstanceState
==
null
)
{
initialRequest
();
presenter
.
loadMessages
();
}
}
}
}
...
@@ -155,7 +131,7 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -155,7 +131,7 @@ public class RoomFragment extends AbstractChatRoomFragment
@Override
@Override
protected
void
onSetupView
()
{
protected
void
onSetupView
()
{
RecyclerView
listView
=
(
RecyclerView
)
rootView
.
findViewById
(
R
.
id
.
recyclerview
);
RecyclerView
listView
=
(
RecyclerView
)
rootView
.
findViewById
(
R
.
id
.
recyclerview
);
adapter
=
new
MessageListAdapter
(
getContext
(),
hostname
,
userId
,
token
);
adapter
=
new
MessageListAdapter
(
getContext
(),
hostname
);
listView
.
setAdapter
(
adapter
);
listView
.
setAdapter
(
adapter
);
adapter
.
setOnItemClickListener
(
this
);
adapter
.
setOnItemClickListener
(
this
);
...
@@ -175,7 +151,7 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -175,7 +151,7 @@ public class RoomFragment extends AbstractChatRoomFragment
scrollListener
=
new
LoadMoreScrollListener
(
layoutManager
,
40
)
{
scrollListener
=
new
LoadMoreScrollListener
(
layoutManager
,
40
)
{
@Override
@Override
public
void
requestMoreItem
()
{
public
void
requestMoreItem
()
{
loadMoreRequest
();
presenter
.
loadMoreMessages
();
}
}
};
};
listView
.
addOnScrollListener
(
scrollListener
);
listView
.
addOnScrollListener
(
scrollListener
);
...
@@ -237,20 +213,7 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -237,20 +213,7 @@ public class RoomFragment extends AbstractChatRoomFragment
@Override
@Override
public
void
onItemClick
(
PairedMessage
pairedMessage
)
{
public
void
onItemClick
(
PairedMessage
pairedMessage
)
{
if
(
pairedMessage
.
target
!=
null
)
{
presenter
.
onMessageSelected
(
pairedMessage
.
target
);
final
int
syncState
=
pairedMessage
.
target
.
getSyncState
();
if
(
syncState
==
SyncState
.
FAILED
)
{
final
String
messageId
=
pairedMessage
.
target
.
getId
();
new
AlertDialog
.
Builder
(
getContext
())
.
setPositiveButton
(
R
.
string
.
resend
,
(
dialog
,
which
)
->
presenter
.
resendMessage
(
messageId
))
.
setNegativeButton
(
android
.
R
.
string
.
cancel
,
null
)
.
setNeutralButton
(
R
.
string
.
discard
,
(
dialog
,
which
)
->
presenter
.
deleteMessage
(
messageId
))
.
show
();
}
}
}
}
private
void
setupSideMenu
()
{
private
void
setupSideMenu
()
{
...
@@ -311,44 +274,16 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -311,44 +274,16 @@ public class RoomFragment extends AbstractChatRoomFragment
}
}
private
void
uploadFile
(
Uri
uri
)
{
private
void
uploadFile
(
Uri
uri
)
{
String
uplId
=
new
FileUploadHelper
(
getContext
(),
realmHelper
)
String
uplId
=
new
FileUploadHelper
(
getContext
(),
RealmStore
.
get
(
hostname
)
)
.
requestUploading
(
roomId
,
uri
);
.
requestUploading
(
roomId
,
uri
);
if
(!
TextUtils
.
isEmpty
(
uplId
))
{
if
(!
TextUtils
.
isEmpty
(
uplId
))
{
FileUploadProgressDialogFragment
.
create
(
hostname
,
roomId
,
uplId
)
FileUploadProgressDialogFragment
.
create
(
hostname
,
roomId
,
uplId
)
.
show
(
getFragmentManager
(),
FileUploadProgressDialogFragment
.
class
.
getSimpleName
()
);
.
show
(
getFragmentManager
(),
"FileUploadProgressDialogFragment"
);
}
else
{
}
else
{
// show error.
// show error.
}
}
}
}
private
void
onRenderRoom
(
Room
room
)
{
String
type
=
room
.
getType
();
if
(
RealmRoom
.
TYPE_CHANNEL
.
equals
(
type
))
{
setToolbarRoomIcon
(
R
.
drawable
.
ic_hashtag_gray_24dp
);
}
else
if
(
RealmRoom
.
TYPE_PRIVATE
.
equals
(
type
))
{
setToolbarRoomIcon
(
R
.
drawable
.
ic_lock_gray_24dp
);
}
else
if
(
RealmRoom
.
TYPE_DIRECT_MESSAGE
.
equals
(
type
))
{
setToolbarRoomIcon
(
R
.
drawable
.
ic_at_gray_24dp
);
}
else
{
setToolbarRoomIcon
(
0
);
}
setToolbarTitle
(
room
.
getName
());
boolean
unreadMessageExists
=
room
.
isAlert
();
if
(
newMessageIndicatorManager
!=
null
&&
previousUnreadMessageExists
&&
!
unreadMessageExists
)
{
newMessageIndicatorManager
.
reset
();
}
previousUnreadMessageExists
=
unreadMessageExists
;
}
private
void
initialRequest
()
{
presenter
.
loadMessages
();
}
private
void
loadMoreRequest
()
{
presenter
.
loadMoreMessages
();
}
private
void
markAsReadIfNeeded
()
{
private
void
markAsReadIfNeeded
()
{
presenter
.
onMarkAsRead
();
presenter
.
onMarkAsRead
();
}
}
...
@@ -445,7 +380,23 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -445,7 +380,23 @@ public class RoomFragment extends AbstractChatRoomFragment
@Override
@Override
public
void
render
(
Room
room
)
{
public
void
render
(
Room
room
)
{
onRenderRoom
(
room
);
String
type
=
room
.
getType
();
if
(
Room
.
TYPE_CHANNEL
.
equals
(
type
))
{
setToolbarRoomIcon
(
R
.
drawable
.
ic_hashtag_gray_24dp
);
}
else
if
(
Room
.
TYPE_PRIVATE
.
equals
(
type
))
{
setToolbarRoomIcon
(
R
.
drawable
.
ic_lock_gray_24dp
);
}
else
if
(
Room
.
TYPE_DIRECT_MESSAGE
.
equals
(
type
))
{
setToolbarRoomIcon
(
R
.
drawable
.
ic_at_gray_24dp
);
}
else
{
setToolbarRoomIcon
(
0
);
}
setToolbarTitle
(
room
.
getName
());
boolean
unreadMessageExists
=
room
.
isAlert
();
if
(
newMessageIndicatorManager
!=
null
&&
previousUnreadMessageExists
&&
!
unreadMessageExists
)
{
newMessageIndicatorManager
.
reset
();
}
previousUnreadMessageExists
=
unreadMessageExists
;
}
}
@Override
@Override
...
@@ -477,4 +428,15 @@ public class RoomFragment extends AbstractChatRoomFragment
...
@@ -477,4 +428,15 @@ public class RoomFragment extends AbstractChatRoomFragment
public
void
showMessages
(
List
<
Message
>
messages
)
{
public
void
showMessages
(
List
<
Message
>
messages
)
{
adapter
.
updateData
(
messages
);
adapter
.
updateData
(
messages
);
}
}
@Override
public
void
showMessageSendFailure
(
Message
message
)
{
new
AlertDialog
.
Builder
(
getContext
())
.
setPositiveButton
(
R
.
string
.
resend
,
(
dialog
,
which
)
->
presenter
.
resendMessage
(
message
))
.
setNegativeButton
(
android
.
R
.
string
.
cancel
,
null
)
.
setNeutralButton
(
R
.
string
.
discard
,
(
dialog
,
which
)
->
presenter
.
deleteMessage
(
message
))
.
show
();
}
}
}
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomPresenter.java
View file @
772b55bd
package
chat
.
rocket
.
android
.
fragment
.
chatroom
;
package
chat
.
rocket
.
android
.
fragment
.
chatroom
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.v4.util.Pair
;
import
android.support.v4.util.Pair
;
import
java.util.UUID
;
import
java.util.UUID
;
import
chat.rocket.android.BackgroundLooper
;
import
chat.rocket.android.BackgroundLooper
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.android.shared.BasePresenter
;
import
chat.rocket.core.SyncState
;
import
chat.rocket.core.SyncState
;
import
chat.rocket.core.models.Message
;
import
chat.rocket.core.models.Message
;
import
chat.rocket.core.models.RoomHistoryState
;
import
chat.rocket.core.models.RoomHistoryState
;
...
@@ -17,9 +19,9 @@ import chat.rocket.android.service.ConnectivityManagerApi;
...
@@ -17,9 +19,9 @@ import chat.rocket.android.service.ConnectivityManagerApi;
import
rx.Single
;
import
rx.Single
;
import
rx.Subscription
;
import
rx.Subscription
;
import
rx.android.schedulers.AndroidSchedulers
;
import
rx.android.schedulers.AndroidSchedulers
;
import
rx.subscriptions.CompositeSubscription
;
public
class
RoomPresenter
implements
RoomContract
.
Presenter
{
public
class
RoomPresenter
extends
BasePresenter
<
RoomContract
.
View
>
implements
RoomContract
.
Presenter
{
private
final
String
roomId
;
private
final
String
roomId
;
private
final
UserRepository
userRepository
;
private
final
UserRepository
userRepository
;
...
@@ -28,9 +30,6 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -28,9 +30,6 @@ public class RoomPresenter implements RoomContract.Presenter {
private
final
MethodCallHelper
methodCallHelper
;
private
final
MethodCallHelper
methodCallHelper
;
private
final
ConnectivityManagerApi
connectivityManagerApi
;
private
final
ConnectivityManagerApi
connectivityManagerApi
;
private
CompositeSubscription
compositeSubscription
=
new
CompositeSubscription
();
private
RoomContract
.
View
view
;
public
RoomPresenter
(
String
roomId
,
UserRepository
userRepository
,
public
RoomPresenter
(
String
roomId
,
UserRepository
userRepository
,
RoomRepository
roomRepository
,
RoomRepository
roomRepository
,
MessageRepository
messageRepository
,
MessageRepository
messageRepository
,
...
@@ -46,19 +45,13 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -46,19 +45,13 @@ public class RoomPresenter implements RoomContract.Presenter {
@Override
@Override
public
void
bindView
(
@NonNull
RoomContract
.
View
view
)
{
public
void
bindView
(
@NonNull
RoomContract
.
View
view
)
{
this
.
view
=
view
;
super
.
bindView
(
view
)
;
getRoomInfo
();
getRoomInfo
();
getRoomHistoryStateInfo
();
getRoomHistoryStateInfo
();
getMessages
();
getMessages
();
}
}
@Override
public
void
release
()
{
compositeSubscription
.
clear
();
this
.
view
=
null
;
}
@Override
@Override
public
void
loadMessages
()
{
public
void
loadMessages
()
{
RoomHistoryState
roomHistoryState
=
RoomHistoryState
.
builder
()
RoomHistoryState
roomHistoryState
=
RoomHistoryState
.
builder
()
...
@@ -79,7 +72,7 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -79,7 +72,7 @@ public class RoomPresenter implements RoomContract.Presenter {
}
}
});
});
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
@Override
@Override
...
@@ -103,12 +96,23 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -103,12 +96,23 @@ public class RoomPresenter implements RoomContract.Presenter {
}
}
});
});
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
@Override
public
void
onMessageSelected
(
@Nullable
Message
message
)
{
if
(
message
==
null
)
{
return
;
}
if
(
message
.
getSyncState
()
==
SyncState
.
FAILED
)
{
view
.
showMessageSendFailure
(
message
);
}
}
}
@Override
@Override
public
void
sendMessage
(
String
messageText
)
{
public
void
sendMessage
(
String
messageText
)
{
final
Subscription
subscription
=
userRepository
.
getCurrent
User
()
final
Subscription
subscription
=
userRepository
.
getCurrent
()
.
filter
(
user
->
user
!=
null
)
.
filter
(
user
->
user
!=
null
)
.
first
()
.
first
()
.
toSingle
()
.
toSingle
()
...
@@ -133,36 +137,34 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -133,36 +137,34 @@ public class RoomPresenter implements RoomContract.Presenter {
}
}
});
});
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
@Override
@Override
public
void
resendMessage
(
String
messageId
)
{
public
void
resendMessage
(
Message
message
)
{
final
Subscription
subscription
=
messageRepository
.
getById
(
messageId
)
final
Subscription
subscription
=
messageRepository
.
resend
(
.
map
(
message
->
message
.
withSyncState
(
SyncState
.
NOT_SYNCED
))
message
.
withSyncState
(
SyncState
.
NOT_SYNCED
))
.
flatMap
(
message
->
messageRepository
.
resend
(
message
))
.
subscribeOn
(
AndroidSchedulers
.
from
(
BackgroundLooper
.
get
()))
.
subscribeOn
(
AndroidSchedulers
.
from
(
BackgroundLooper
.
get
()))
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
();
.
subscribe
();
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
@Override
@Override
public
void
deleteMessage
(
String
messageId
)
{
public
void
deleteMessage
(
Message
message
)
{
final
Subscription
subscription
=
messageRepository
.
getById
(
messageId
)
final
Subscription
subscription
=
messageRepository
.
delete
(
message
)
.
flatMap
(
message
->
messageRepository
.
delete
(
message
))
.
subscribeOn
(
AndroidSchedulers
.
from
(
BackgroundLooper
.
get
()))
.
subscribeOn
(
AndroidSchedulers
.
from
(
BackgroundLooper
.
get
()))
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
();
.
subscribe
();
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
@Override
@Override
public
void
onUnreadCount
()
{
public
void
onUnreadCount
()
{
final
Subscription
subscription
=
Single
.
zip
(
final
Subscription
subscription
=
Single
.
zip
(
userRepository
.
getCurrent
User
()
userRepository
.
getCurrent
()
.
filter
(
user
->
user
!=
null
)
.
filter
(
user
->
user
!=
null
)
.
first
()
.
first
()
.
toSingle
(),
.
toSingle
(),
...
@@ -179,7 +181,7 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -179,7 +181,7 @@ public class RoomPresenter implements RoomContract.Presenter {
count
->
view
.
showUnreadCount
(
count
)
count
->
view
.
showUnreadCount
(
count
)
);
);
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
@Override
@Override
...
@@ -194,7 +196,7 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -194,7 +196,7 @@ public class RoomPresenter implements RoomContract.Presenter {
.
continueWith
(
new
LogcatIfError
())
.
continueWith
(
new
LogcatIfError
())
);
);
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
private
void
getRoomInfo
()
{
private
void
getRoomInfo
()
{
...
@@ -206,7 +208,7 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -206,7 +208,7 @@ public class RoomPresenter implements RoomContract.Presenter {
room
->
view
.
render
(
room
)
room
->
view
.
render
(
room
)
);
);
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
private
void
getRoomHistoryStateInfo
()
{
private
void
getRoomHistoryStateInfo
()
{
...
@@ -224,7 +226,7 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -224,7 +226,7 @@ public class RoomPresenter implements RoomContract.Presenter {
}
}
);
);
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
private
void
getMessages
()
{
private
void
getMessages
()
{
...
@@ -235,6 +237,6 @@ public class RoomPresenter implements RoomContract.Presenter {
...
@@ -235,6 +237,6 @@ public class RoomPresenter implements RoomContract.Presenter {
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
messages
->
view
.
showMessages
(
messages
));
.
subscribe
(
messages
->
view
.
showMessages
(
messages
));
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
}
}
app/src/main/java/chat/rocket/android/fragment/server_config/RetryLoginFragment.java
View file @
772b55bd
...
@@ -8,7 +8,7 @@ import android.widget.TextView;
...
@@ -8,7 +8,7 @@ import android.widget.TextView;
import
chat.rocket.android.R
;
import
chat.rocket.android.R
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmObjectObserver
;
import
chat.rocket.persistence.realm.RealmObjectObserver
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.RealmStore
;
...
@@ -16,7 +16,7 @@ import chat.rocket.persistence.realm.RealmStore;
...
@@ -16,7 +16,7 @@ import chat.rocket.persistence.realm.RealmStore;
* Login screen.
* Login screen.
*/
*/
public
class
RetryLoginFragment
extends
AbstractServerConfigFragment
{
public
class
RetryLoginFragment
extends
AbstractServerConfigFragment
{
private
RealmObjectObserver
<
Session
>
sessionObserver
;
private
RealmObjectObserver
<
Realm
Session
>
sessionObserver
;
@Override
@Override
protected
int
getLayout
()
{
protected
int
getLayout
()
{
...
@@ -27,7 +27,7 @@ public class RetryLoginFragment extends AbstractServerConfigFragment {
...
@@ -27,7 +27,7 @@ public class RetryLoginFragment extends AbstractServerConfigFragment {
public
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
public
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
sessionObserver
=
RealmStore
.
get
(
hostname
)
sessionObserver
=
RealmStore
.
get
(
hostname
)
.
createObjectObserver
(
Session:
:
queryDefaultSession
)
.
createObjectObserver
(
Realm
Session:
:
queryDefaultSession
)
.
setOnUpdateListener
(
this
::
onRenderServerConfigSession
);
.
setOnUpdateListener
(
this
::
onRenderServerConfigSession
);
}
}
...
@@ -35,7 +35,7 @@ public class RetryLoginFragment extends AbstractServerConfigFragment {
...
@@ -35,7 +35,7 @@ public class RetryLoginFragment extends AbstractServerConfigFragment {
protected
void
onSetupView
()
{
protected
void
onSetupView
()
{
}
}
private
void
onRenderServerConfigSession
(
Session
session
)
{
private
void
onRenderServerConfigSession
(
Realm
Session
session
)
{
if
(
session
==
null
)
{
if
(
session
==
null
)
{
return
;
return
;
}
}
...
...
app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainContract.java
View file @
772b55bd
package
chat
.
rocket
.
android
.
fragment
.
sidebar
;
package
chat
.
rocket
.
android
.
fragment
.
sidebar
;
import
android.support.annotation.NonNull
;
import
java.util.List
;
import
java.util.List
;
import
chat.rocket.android.shared.BaseContract
;
import
chat.rocket.core.models.Room
;
import
chat.rocket.core.models.Room
;
import
chat.rocket.core.models.User
;
import
chat.rocket.core.models.User
;
public
interface
SidebarMainContract
{
public
interface
SidebarMainContract
{
interface
View
{
interface
View
extends
BaseContract
.
View
{
void
showScreen
();
void
showScreen
();
...
@@ -19,10 +18,7 @@ public interface SidebarMainContract {
...
@@ -19,10 +18,7 @@ public interface SidebarMainContract {
void
showUser
(
User
user
);
void
showUser
(
User
user
);
}
}
interface
Presenter
{
interface
Presenter
extends
BaseContract
.
Presenter
<
View
>
{
void
bindView
(
@NonNull
View
view
);
void
release
();
void
onUserOnline
();
void
onUserOnline
();
...
...
app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainPresenter.java
View file @
772b55bd
...
@@ -6,24 +6,21 @@ import chat.rocket.android.BackgroundLooper;
...
@@ -6,24 +6,21 @@ import chat.rocket.android.BackgroundLooper;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.shared.BasePresenter
;
import
chat.rocket.core.models.User
;
import
chat.rocket.core.models.User
;
import
chat.rocket.core.repositories.RoomRepository
;
import
chat.rocket.core.repositories.RoomRepository
;
import
chat.rocket.core.repositories.UserRepository
;
import
chat.rocket.core.repositories.UserRepository
;
import
rx.Subscription
;
import
rx.Subscription
;
import
rx.android.schedulers.AndroidSchedulers
;
import
rx.android.schedulers.AndroidSchedulers
;
import
rx.subscriptions.CompositeSubscription
;
public
class
SidebarMainPresenter
implements
SidebarMainContract
.
Presenter
{
public
class
SidebarMainPresenter
extends
BasePresenter
<
SidebarMainContract
.
View
>
implements
SidebarMainContract
.
Presenter
{
private
final
String
hostname
;
private
final
String
hostname
;
private
final
RoomRepository
roomRepository
;
private
final
RoomRepository
roomRepository
;
private
final
UserRepository
userRepository
;
private
final
UserRepository
userRepository
;
private
final
MethodCallHelper
methodCallHelper
;
private
final
MethodCallHelper
methodCallHelper
;
private
SidebarMainContract
.
View
view
;
private
CompositeSubscription
compositeSubscription
=
new
CompositeSubscription
();
public
SidebarMainPresenter
(
String
hostname
,
RoomRepository
roomRepository
,
public
SidebarMainPresenter
(
String
hostname
,
RoomRepository
roomRepository
,
UserRepository
userRepository
,
MethodCallHelper
methodCallHelper
)
{
UserRepository
userRepository
,
MethodCallHelper
methodCallHelper
)
{
this
.
hostname
=
hostname
;
this
.
hostname
=
hostname
;
...
@@ -34,7 +31,7 @@ public class SidebarMainPresenter implements SidebarMainContract.Presenter {
...
@@ -34,7 +31,7 @@ public class SidebarMainPresenter implements SidebarMainContract.Presenter {
@Override
@Override
public
void
bindView
(
@NonNull
SidebarMainContract
.
View
view
)
{
public
void
bindView
(
@NonNull
SidebarMainContract
.
View
view
)
{
this
.
view
=
view
;
super
.
bindView
(
view
)
;
if
(
TextUtils
.
isEmpty
(
hostname
))
{
if
(
TextUtils
.
isEmpty
(
hostname
))
{
view
.
showEmptyScreen
();
view
.
showEmptyScreen
();
...
@@ -47,12 +44,6 @@ public class SidebarMainPresenter implements SidebarMainContract.Presenter {
...
@@ -47,12 +44,6 @@ public class SidebarMainPresenter implements SidebarMainContract.Presenter {
subscribeToUser
();
subscribeToUser
();
}
}
@Override
public
void
release
()
{
compositeSubscription
.
clear
();
view
=
null
;
}
@Override
@Override
public
void
onUserOnline
()
{
public
void
onUserOnline
()
{
updateCurrentUserStatus
(
User
.
STATUS_ONLINE
);
updateCurrentUserStatus
(
User
.
STATUS_ONLINE
);
...
@@ -89,17 +80,17 @@ public class SidebarMainPresenter implements SidebarMainContract.Presenter {
...
@@ -89,17 +80,17 @@ public class SidebarMainPresenter implements SidebarMainContract.Presenter {
rooms
->
view
.
showRoomList
(
rooms
)
rooms
->
view
.
showRoomList
(
rooms
)
);
);
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
private
void
subscribeToUser
()
{
private
void
subscribeToUser
()
{
final
Subscription
subscription
=
userRepository
.
getCurrent
User
()
final
Subscription
subscription
=
userRepository
.
getCurrent
()
.
distinctUntilChanged
()
.
distinctUntilChanged
()
.
subscribeOn
(
AndroidSchedulers
.
from
(
BackgroundLooper
.
get
()))
.
subscribeOn
(
AndroidSchedulers
.
from
(
BackgroundLooper
.
get
()))
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
user
->
view
.
showUser
(
user
));
.
subscribe
(
user
->
view
.
showUser
(
user
));
compositeSubscription
.
add
(
subscription
);
addSubscription
(
subscription
);
}
}
private
void
updateCurrentUserStatus
(
String
status
)
{
private
void
updateCurrentUserStatus
(
String
status
)
{
...
...
app/src/main/java/chat/rocket/android/layouthelper/chatroom/AbstractMessageViewHolder.java
View file @
772b55bd
...
@@ -17,15 +17,13 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe
...
@@ -17,15 +17,13 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe
protected
final
TextView
timestamp
;
protected
final
TextView
timestamp
;
protected
final
View
userAndTimeContainer
;
protected
final
View
userAndTimeContainer
;
protected
final
String
hostname
;
protected
final
String
hostname
;
protected
final
String
userId
;
protected
final
String
token
;
protected
final
View
newDayContainer
;
protected
final
View
newDayContainer
;
protected
final
TextView
newDayText
;
protected
final
TextView
newDayText
;
/**
/**
* constructor WITH hostname.
* constructor WITH hostname.
*/
*/
public
AbstractMessageViewHolder
(
View
itemView
,
String
hostname
,
String
userId
,
String
token
)
{
public
AbstractMessageViewHolder
(
View
itemView
,
String
hostname
)
{
super
(
itemView
);
super
(
itemView
);
avatar
=
(
RocketChatAvatar
)
itemView
.
findViewById
(
R
.
id
.
user_avatar
);
avatar
=
(
RocketChatAvatar
)
itemView
.
findViewById
(
R
.
id
.
user_avatar
);
username
=
(
TextView
)
itemView
.
findViewById
(
R
.
id
.
username
);
username
=
(
TextView
)
itemView
.
findViewById
(
R
.
id
.
username
);
...
@@ -35,8 +33,6 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe
...
@@ -35,8 +33,6 @@ public abstract class AbstractMessageViewHolder extends ModelViewHolder<PairedMe
newDayContainer
=
itemView
.
findViewById
(
R
.
id
.
newday_container
);
newDayContainer
=
itemView
.
findViewById
(
R
.
id
.
newday_container
);
newDayText
=
(
TextView
)
itemView
.
findViewById
(
R
.
id
.
newday_text
);
newDayText
=
(
TextView
)
itemView
.
findViewById
(
R
.
id
.
newday_text
);
this
.
hostname
=
hostname
;
this
.
hostname
=
hostname
;
this
.
userId
=
userId
;
this
.
token
=
token
;
}
}
/**
/**
...
...
app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessageListAdapter.java
View file @
772b55bd
...
@@ -23,16 +23,12 @@ public class MessageListAdapter
...
@@ -23,16 +23,12 @@ public class MessageListAdapter
private
static
final
int
VIEW_TYPE_SYSTEM_MESSAGE
=
2
;
private
static
final
int
VIEW_TYPE_SYSTEM_MESSAGE
=
2
;
private
final
String
hostname
;
private
final
String
hostname
;
private
final
String
userId
;
private
final
String
token
;
private
boolean
hasNext
;
private
boolean
hasNext
;
private
boolean
isLoaded
;
private
boolean
isLoaded
;
public
MessageListAdapter
(
Context
context
,
String
hostname
,
String
userId
,
String
token
)
{
public
MessageListAdapter
(
Context
context
,
String
hostname
)
{
super
(
context
);
super
(
context
);
this
.
hostname
=
hostname
;
this
.
hostname
=
hostname
;
this
.
userId
=
userId
;
this
.
token
=
token
;
}
}
/**
/**
...
@@ -86,11 +82,11 @@ public class MessageListAdapter
...
@@ -86,11 +82,11 @@ public class MessageListAdapter
protected
AbstractMessageViewHolder
onCreateRealmModelViewHolder
(
int
viewType
,
View
itemView
)
{
protected
AbstractMessageViewHolder
onCreateRealmModelViewHolder
(
int
viewType
,
View
itemView
)
{
switch
(
viewType
)
{
switch
(
viewType
)
{
case
VIEW_TYPE_NORMAL_MESSAGE:
case
VIEW_TYPE_NORMAL_MESSAGE:
return
new
MessageNormalViewHolder
(
itemView
,
hostname
,
userId
,
token
);
return
new
MessageNormalViewHolder
(
itemView
,
hostname
);
case
VIEW_TYPE_SYSTEM_MESSAGE:
case
VIEW_TYPE_SYSTEM_MESSAGE:
return
new
MessageSystemViewHolder
(
itemView
,
hostname
,
userId
,
token
);
return
new
MessageSystemViewHolder
(
itemView
,
hostname
);
default
:
default
:
return
new
AbstractMessageViewHolder
(
itemView
,
hostname
,
userId
,
token
)
{
return
new
AbstractMessageViewHolder
(
itemView
,
hostname
)
{
@Override
@Override
protected
void
bindMessage
(
PairedMessage
pairedMessage
)
{
protected
void
bindMessage
(
PairedMessage
pairedMessage
)
{
}
}
...
...
app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessageNormalViewHolder.java
View file @
772b55bd
...
@@ -19,8 +19,8 @@ public class MessageNormalViewHolder extends AbstractMessageViewHolder {
...
@@ -19,8 +19,8 @@ public class MessageNormalViewHolder extends AbstractMessageViewHolder {
/**
/**
* constructor WITH hostname.
* constructor WITH hostname.
*/
*/
public
MessageNormalViewHolder
(
View
itemView
,
String
hostname
,
String
userId
,
String
token
)
{
public
MessageNormalViewHolder
(
View
itemView
,
String
hostname
)
{
super
(
itemView
,
hostname
,
userId
,
token
);
super
(
itemView
,
hostname
);
body
=
(
RocketChatMessageLayout
)
itemView
.
findViewById
(
R
.
id
.
message_body
);
body
=
(
RocketChatMessageLayout
)
itemView
.
findViewById
(
R
.
id
.
message_body
);
urls
=
(
RocketChatMessageUrlsLayout
)
itemView
.
findViewById
(
R
.
id
.
message_urls
);
urls
=
(
RocketChatMessageUrlsLayout
)
itemView
.
findViewById
(
R
.
id
.
message_urls
);
attachments
=
attachments
=
...
@@ -35,6 +35,6 @@ public class MessageNormalViewHolder extends AbstractMessageViewHolder {
...
@@ -35,6 +35,6 @@ public class MessageNormalViewHolder extends AbstractMessageViewHolder {
.
timestampInto
(
timestamp
)
.
timestampInto
(
timestamp
)
.
bodyInto
(
body
)
.
bodyInto
(
body
)
.
urlsInto
(
urls
)
.
urlsInto
(
urls
)
.
attachmentsInto
(
attachments
,
hostname
,
userId
,
token
);
.
attachmentsInto
(
attachments
,
hostname
);
}
}
}
}
app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessageSystemViewHolder.java
View file @
772b55bd
...
@@ -15,8 +15,8 @@ public class MessageSystemViewHolder extends AbstractMessageViewHolder {
...
@@ -15,8 +15,8 @@ public class MessageSystemViewHolder extends AbstractMessageViewHolder {
/**
/**
* constructor WITH hostname.
* constructor WITH hostname.
*/
*/
public
MessageSystemViewHolder
(
View
itemView
,
String
hostname
,
String
userId
,
String
token
)
{
public
MessageSystemViewHolder
(
View
itemView
,
String
hostname
)
{
super
(
itemView
,
hostname
,
userId
,
token
);
super
(
itemView
,
hostname
);
body
=
(
TextView
)
itemView
.
findViewById
(
R
.
id
.
message_body
);
body
=
(
TextView
)
itemView
.
findViewById
(
R
.
id
.
message_body
);
}
}
...
...
app/src/main/java/chat/rocket/android/renderer/MessageRenderer.java
View file @
772b55bd
...
@@ -121,7 +121,7 @@ public class MessageRenderer extends AbstractRenderer<Message> {
...
@@ -121,7 +121,7 @@ public class MessageRenderer extends AbstractRenderer<Message> {
* show urls in RocketChatMessageUrlsLayout.
* show urls in RocketChatMessageUrlsLayout.
*/
*/
public
MessageRenderer
attachmentsInto
(
RocketChatMessageAttachmentsLayout
attachmentsLayout
,
public
MessageRenderer
attachmentsInto
(
RocketChatMessageAttachmentsLayout
attachmentsLayout
,
String
hostname
,
String
userId
,
String
token
)
{
String
hostname
)
{
if
(!
shouldHandle
(
attachmentsLayout
))
{
if
(!
shouldHandle
(
attachmentsLayout
))
{
return
this
;
return
this
;
}
}
...
...
app/src/main/java/chat/rocket/android/service/RealmBasedConnectivityManager.java
View file @
772b55bd
...
@@ -43,7 +43,7 @@ import rx.subjects.PublishSubject;
...
@@ -43,7 +43,7 @@ import rx.subjects.PublishSubject;
/*package*/
RealmBasedConnectivityManager
setContext
(
Context
appContext
)
{
/*package*/
RealmBasedConnectivityManager
setContext
(
Context
appContext
)
{
this
.
appContext
=
appContext
;
this
.
appContext
=
appContext
.
getApplicationContext
()
;
return
this
;
return
this
;
}
}
...
@@ -67,7 +67,8 @@ import rx.subjects.PublishSubject;
...
@@ -67,7 +67,8 @@ import rx.subjects.PublishSubject;
public
void
ensureConnections
()
{
public
void
ensureConnections
()
{
for
(
String
hostname
:
serverConnectivityList
.
keySet
())
{
for
(
String
hostname
:
serverConnectivityList
.
keySet
())
{
connectToServerIfNeeded
(
hostname
,
true
/* force connect */
)
connectToServerIfNeeded
(
hostname
,
true
/* force connect */
)
.
subscribe
(
_val
->
{
},
RCLog:
:
e
);
.
subscribe
(
_val
->
{
},
RCLog:
:
e
);
}
}
}
}
...
@@ -79,7 +80,8 @@ import rx.subjects.PublishSubject;
...
@@ -79,7 +80,8 @@ import rx.subjects.PublishSubject;
serverConnectivityList
.
put
(
hostname
,
ServerConnectivity
.
STATE_DISCONNECTED
);
serverConnectivityList
.
put
(
hostname
,
ServerConnectivity
.
STATE_DISCONNECTED
);
}
}
connectToServerIfNeeded
(
hostname
,
false
)
connectToServerIfNeeded
(
hostname
,
false
)
.
subscribe
(
_val
->
{
},
RCLog:
:
e
);
.
subscribe
(
_val
->
{
},
RCLog:
:
e
);
}
}
@Override
@Override
...
@@ -87,7 +89,8 @@ import rx.subjects.PublishSubject;
...
@@ -87,7 +89,8 @@ import rx.subjects.PublishSubject;
RealmBasedServerInfo
.
remove
(
hostname
);
RealmBasedServerInfo
.
remove
(
hostname
);
if
(
serverConnectivityList
.
containsKey
(
hostname
))
{
if
(
serverConnectivityList
.
containsKey
(
hostname
))
{
disconnectFromServerIfNeeded
(
hostname
)
disconnectFromServerIfNeeded
(
hostname
)
.
subscribe
(
_val
->
{
},
RCLog:
:
e
);
.
subscribe
(
_val
->
{
},
RCLog:
:
e
);
}
}
}
}
...
@@ -187,7 +190,8 @@ import rx.subjects.PublishSubject;
...
@@ -187,7 +190,8 @@ import rx.subjects.PublishSubject;
.
filter
(
serverConnectivity
->
hostname
.
equals
(
serverConnectivity
.
hostname
))
.
filter
(
serverConnectivity
->
hostname
.
equals
(
serverConnectivity
.
hostname
))
.
map
(
serverConnectivity
->
serverConnectivity
.
state
)
.
map
(
serverConnectivity
->
serverConnectivity
.
state
)
.
filter
(
state
->
.
filter
(
state
->
state
==
ServerConnectivity
.
STATE_CONNECTED
||
state
==
ServerConnectivity
.
STATE_DISCONNECTED
)
state
==
ServerConnectivity
.
STATE_CONNECTED
||
state
==
ServerConnectivity
.
STATE_DISCONNECTED
)
.
first
()
.
first
()
.
toSingle
()
.
toSingle
()
.
flatMap
(
state
->
.
flatMap
(
state
->
...
...
app/src/main/java/chat/rocket/android/service/RocketChatWebSocketThread.java
View file @
772b55bd
...
@@ -15,7 +15,7 @@ import chat.rocket.android.helper.LogcatIfError;
...
@@ -15,7 +15,7 @@ import chat.rocket.android.helper.LogcatIfError;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.log.RCLog
;
import
chat.rocket.android.log.RCLog
;
import
chat.rocket.core.models.ServerInfo
;
import
chat.rocket.core.models.ServerInfo
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.android.service.ddp.base.ActiveUsersSubscriber
;
import
chat.rocket.android.service.ddp.base.ActiveUsersSubscriber
;
...
@@ -127,7 +127,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
...
@@ -127,7 +127,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
private
void
forceInvalidateTokens
()
{
private
void
forceInvalidateTokens
()
{
realmHelper
.
executeTransaction
(
realm
->
{
realmHelper
.
executeTransaction
(
realm
->
{
Session
session
=
Session
.
queryDefaultSession
(
realm
).
findFirst
();
RealmSession
session
=
Realm
Session
.
queryDefaultSession
(
realm
).
findFirst
();
if
(
session
!=
null
if
(
session
!=
null
&&
!
TextUtils
.
isEmpty
(
session
.
getToken
())
&&
!
TextUtils
.
isEmpty
(
session
.
getToken
())
&&
(
session
.
isTokenVerified
()
||
!
TextUtils
.
isEmpty
(
session
.
getError
())))
{
&&
(
session
.
isTokenVerified
()
||
!
TextUtils
.
isEmpty
(
session
.
getError
())))
{
...
@@ -240,10 +240,10 @@ public class RocketChatWebSocketThread extends HandlerThread {
...
@@ -240,10 +240,10 @@ public class RocketChatWebSocketThread extends HandlerThread {
});
});
return
realmHelper
.
executeTransaction
(
realm
->
{
return
realmHelper
.
executeTransaction
(
realm
->
{
Session
sessionObj
=
Session
.
queryDefaultSession
(
realm
).
findFirst
();
RealmSession
sessionObj
=
Realm
Session
.
queryDefaultSession
(
realm
).
findFirst
();
if
(
sessionObj
==
null
)
{
if
(
sessionObj
==
null
)
{
realm
.
createOrUpdateObjectFromJson
(
Session
.
class
,
realm
.
createOrUpdateObjectFromJson
(
Realm
Session
.
class
,
new
JSONObject
().
put
(
Session
.
ID
,
Session
.
DEFAULT_ID
));
new
JSONObject
().
put
(
RealmSession
.
ID
,
Realm
Session
.
DEFAULT_ID
));
}
else
{
}
else
{
// invalidate login token.
// invalidate login token.
if
(!
TextUtils
.
isEmpty
(
sessionObj
.
getToken
())
&&
sessionObj
.
isTokenVerified
())
{
if
(!
TextUtils
.
isEmpty
(
sessionObj
.
getToken
())
&&
sessionObj
.
isTokenVerified
())
{
...
...
app/src/main/java/chat/rocket/android/service/observer/FileUploadingWithUfsObserver.java
View file @
772b55bd
...
@@ -16,7 +16,7 @@ import chat.rocket.android.log.RCLog;
...
@@ -16,7 +16,7 @@ import chat.rocket.android.log.RCLog;
import
chat.rocket.core.SyncState
;
import
chat.rocket.core.SyncState
;
import
chat.rocket.persistence.realm.models.ddp.RealmUser
;
import
chat.rocket.persistence.realm.models.ddp.RealmUser
;
import
chat.rocket.persistence.realm.models.internal.FileUploading
;
import
chat.rocket.persistence.realm.models.internal.FileUploading
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.android.service.DDPClientRef
;
import
chat.rocket.android.service.DDPClientRef
;
import
okhttp3.MediaType
;
import
okhttp3.MediaType
;
...
@@ -94,8 +94,8 @@ public class FileUploadingWithUfsObserver extends AbstractModelObserver<FileUplo
...
@@ -94,8 +94,8 @@ public class FileUploadingWithUfsObserver extends AbstractModelObserver<FileUplo
RealmUser
currentUser
=
realmHelper
.
executeTransactionForRead
(
realm
->
RealmUser
currentUser
=
realmHelper
.
executeTransactionForRead
(
realm
->
RealmUser
.
queryCurrentUser
(
realm
).
findFirst
());
RealmUser
.
queryCurrentUser
(
realm
).
findFirst
());
Session
session
=
realmHelper
.
executeTransactionForRead
(
realm
->
Realm
Session
session
=
realmHelper
.
executeTransactionForRead
(
realm
->
Session
.
queryDefaultSession
(
realm
).
findFirst
());
Realm
Session
.
queryDefaultSession
(
realm
).
findFirst
());
if
(
currentUser
==
null
||
session
==
null
)
{
if
(
currentUser
==
null
||
session
==
null
)
{
return
;
return
;
}
}
...
...
app/src/main/java/chat/rocket/android/service/observer/SessionObserver.java
View file @
772b55bd
...
@@ -11,7 +11,7 @@ import chat.rocket.android.helper.LogcatIfError;
...
@@ -11,7 +11,7 @@ import chat.rocket.android.helper.LogcatIfError;
import
chat.rocket.persistence.realm.models.internal.GetUsersOfRoomsProcedure
;
import
chat.rocket.persistence.realm.models.internal.GetUsersOfRoomsProcedure
;
import
chat.rocket.persistence.realm.models.internal.LoadMessageProcedure
;
import
chat.rocket.persistence.realm.models.internal.LoadMessageProcedure
;
import
chat.rocket.persistence.realm.models.internal.MethodCall
;
import
chat.rocket.persistence.realm.models.internal.MethodCall
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.android.service.DDPClientRef
;
import
chat.rocket.android.service.DDPClientRef
;
import
chat.rocket.android.service.internal.StreamRoomMessageManager
;
import
chat.rocket.android.service.internal.StreamRoomMessageManager
;
...
@@ -20,7 +20,7 @@ import hugo.weaving.DebugLog;
...
@@ -20,7 +20,7 @@ import hugo.weaving.DebugLog;
/**
/**
* Observes user is logged into server.
* Observes user is logged into server.
*/
*/
public
class
SessionObserver
extends
AbstractModelObserver
<
Session
>
{
public
class
SessionObserver
extends
AbstractModelObserver
<
Realm
Session
>
{
private
final
StreamRoomMessageManager
streamNotifyMessage
;
private
final
StreamRoomMessageManager
streamNotifyMessage
;
private
final
RaixPushHelper
pushHelper
;
private
final
RaixPushHelper
pushHelper
;
private
int
count
;
private
int
count
;
...
@@ -38,16 +38,16 @@ public class SessionObserver extends AbstractModelObserver<Session> {
...
@@ -38,16 +38,16 @@ public class SessionObserver extends AbstractModelObserver<Session> {
}
}
@Override
@Override
public
RealmResults
<
Session
>
queryItems
(
Realm
realm
)
{
public
RealmResults
<
Realm
Session
>
queryItems
(
Realm
realm
)
{
return
realm
.
where
(
Session
.
class
)
return
realm
.
where
(
Realm
Session
.
class
)
.
isNotNull
(
Session
.
TOKEN
)
.
isNotNull
(
Realm
Session
.
TOKEN
)
.
equalTo
(
Session
.
TOKEN_VERIFIED
,
true
)
.
equalTo
(
Realm
Session
.
TOKEN_VERIFIED
,
true
)
.
isNull
(
Session
.
ERROR
)
.
isNull
(
Realm
Session
.
ERROR
)
.
findAll
();
.
findAll
();
}
}
@Override
@Override
public
void
onUpdateResults
(
List
<
Session
>
results
)
{
public
void
onUpdateResults
(
List
<
Realm
Session
>
results
)
{
int
origCount
=
count
;
int
origCount
=
count
;
count
=
results
.
size
();
count
=
results
.
size
();
if
(
origCount
>
0
&&
count
>
0
)
{
if
(
origCount
>
0
&&
count
>
0
)
{
...
...
app/src/main/java/chat/rocket/android/service/observer/TokenLoginObserver.java
View file @
772b55bd
...
@@ -7,11 +7,11 @@ import io.realm.RealmResults;
...
@@ -7,11 +7,11 @@ import io.realm.RealmResults;
import
java.util.List
;
import
java.util.List
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.android.helper.LogcatIfError
;
import
chat.rocket.persistence.realm.models.internal.Session
;
import
chat.rocket.persistence.realm.models.internal.
Realm
Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.android.service.DDPClientRef
;
import
chat.rocket.android.service.DDPClientRef
;
public
class
TokenLoginObserver
extends
AbstractModelObserver
<
Session
>
{
public
class
TokenLoginObserver
extends
AbstractModelObserver
<
Realm
Session
>
{
private
final
MethodCallHelper
methodCall
;
private
final
MethodCallHelper
methodCall
;
...
@@ -22,21 +22,21 @@ public class TokenLoginObserver extends AbstractModelObserver<Session> {
...
@@ -22,21 +22,21 @@ public class TokenLoginObserver extends AbstractModelObserver<Session> {
}
}
@Override
@Override
public
RealmResults
<
Session
>
queryItems
(
Realm
realm
)
{
public
RealmResults
<
Realm
Session
>
queryItems
(
Realm
realm
)
{
return
realm
.
where
(
Session
.
class
)
return
realm
.
where
(
Realm
Session
.
class
)
.
isNotNull
(
Session
.
TOKEN
)
.
isNotNull
(
Realm
Session
.
TOKEN
)
.
equalTo
(
Session
.
TOKEN_VERIFIED
,
false
)
.
equalTo
(
Realm
Session
.
TOKEN_VERIFIED
,
false
)
.
isNull
(
Session
.
ERROR
)
.
isNull
(
Realm
Session
.
ERROR
)
.
findAll
();
.
findAll
();
}
}
@Override
@Override
public
void
onUpdateResults
(
List
<
Session
>
results
)
{
public
void
onUpdateResults
(
List
<
Realm
Session
>
results
)
{
if
(
results
.
isEmpty
())
{
if
(
results
.
isEmpty
())
{
return
;
return
;
}
}
Session
session
=
results
.
get
(
0
);
Realm
Session
session
=
results
.
get
(
0
);
methodCall
.
loginWithToken
(
session
.
getToken
()).
continueWith
(
new
LogcatIfError
());
methodCall
.
loginWithToken
(
session
.
getToken
()).
continueWith
(
new
LogcatIfError
());
}
}
}
}
app/src/main/java/chat/rocket/android/shared/BaseContract.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
android
.
shared
;
import
android.support.annotation.NonNull
;
public
interface
BaseContract
{
interface
View
{
}
interface
Presenter
<
T
extends
View
>
{
void
bindView
(
@NonNull
T
view
);
void
release
();
}
}
app/src/main/java/chat/rocket/android/shared/BasePresenter.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
android
.
shared
;
import
android.support.annotation.NonNull
;
import
rx.Subscription
;
import
rx.subscriptions.CompositeSubscription
;
public
abstract
class
BasePresenter
<
T
extends
BaseContract
.
View
>
implements
BaseContract
.
Presenter
<
T
>
{
protected
T
view
;
private
CompositeSubscription
compositeSubscription
=
new
CompositeSubscription
();
@Override
public
void
bindView
(
@NonNull
T
view
)
{
this
.
view
=
view
;
}
@Override
public
void
release
()
{
compositeSubscription
.
clear
();
view
=
null
;
}
protected
void
addSubscription
(
Subscription
subscription
)
{
compositeSubscription
.
add
(
subscription
);
}
}
persistence-realm/src/main/java/chat/rocket/persistence/realm/models/internal/Session.java
→
persistence-realm/src/main/java/chat/rocket/persistence/realm/models/internal/
Realm
Session.java
View file @
772b55bd
...
@@ -7,6 +7,7 @@ import io.realm.RealmQuery;
...
@@ -7,6 +7,7 @@ import io.realm.RealmQuery;
import
io.realm.annotations.PrimaryKey
;
import
io.realm.annotations.PrimaryKey
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
chat.rocket.core.models.Session
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.RealmHelper
;
import
chat.rocket.persistence.realm.helpers.LogcatIfError
;
import
chat.rocket.persistence.realm.helpers.LogcatIfError
;
import
hugo.weaving.DebugLog
;
import
hugo.weaving.DebugLog
;
...
@@ -14,7 +15,7 @@ import hugo.weaving.DebugLog;
...
@@ -14,7 +15,7 @@ import hugo.weaving.DebugLog;
/**
/**
* Login session info.
* Login session info.
*/
*/
public
class
Session
extends
RealmObject
{
public
class
Realm
Session
extends
RealmObject
{
@SuppressWarnings
({
"PMD.ShortVariable"
})
@SuppressWarnings
({
"PMD.ShortVariable"
})
public
static
final
String
ID
=
"sessionId"
;
public
static
final
String
ID
=
"sessionId"
;
...
@@ -30,8 +31,8 @@ public class Session extends RealmObject {
...
@@ -30,8 +31,8 @@ public class Session extends RealmObject {
private
boolean
tokenVerified
;
private
boolean
tokenVerified
;
private
String
error
;
private
String
error
;
public
static
RealmQuery
<
Session
>
queryDefaultSession
(
Realm
realm
)
{
public
static
RealmQuery
<
Realm
Session
>
queryDefaultSession
(
Realm
realm
)
{
return
realm
.
where
(
Session
.
class
).
equalTo
(
ID
,
Session
.
DEFAULT_ID
);
return
realm
.
where
(
RealmSession
.
class
).
equalTo
(
ID
,
Realm
Session
.
DEFAULT_ID
);
}
}
/**
/**
...
@@ -42,13 +43,13 @@ public class Session extends RealmObject {
...
@@ -42,13 +43,13 @@ public class Session extends RealmObject {
String
errString
=
exception
.
getMessage
();
String
errString
=
exception
.
getMessage
();
if
(!
TextUtils
.
isEmpty
(
errString
)
&&
errString
.
contains
(
AUTH_ERROR_CODE
))
{
if
(!
TextUtils
.
isEmpty
(
errString
)
&&
errString
.
contains
(
AUTH_ERROR_CODE
))
{
realmHelper
.
executeTransaction
(
realm
->
{
realmHelper
.
executeTransaction
(
realm
->
{
realm
.
delete
(
Session
.
class
);
realm
.
delete
(
Realm
Session
.
class
);
return
null
;
return
null
;
}).
continueWith
(
new
LogcatIfError
());
}).
continueWith
(
new
LogcatIfError
());
}
else
{
}
else
{
realmHelper
.
executeTransaction
(
realmHelper
.
executeTransaction
(
realm
->
realm
.
createOrUpdateObjectFromJson
(
Session
.
class
,
new
JSONObject
()
realm
->
realm
.
createOrUpdateObjectFromJson
(
Realm
Session
.
class
,
new
JSONObject
()
.
put
(
ID
,
Session
.
DEFAULT_ID
)
.
put
(
ID
,
Realm
Session
.
DEFAULT_ID
)
.
put
(
TOKEN_VERIFIED
,
false
)
.
put
(
TOKEN_VERIFIED
,
false
)
.
put
(
ERROR
,
errString
)))
.
put
(
ERROR
,
errString
)))
.
continueWith
(
new
LogcatIfError
());
.
continueWith
(
new
LogcatIfError
());
...
@@ -60,13 +61,13 @@ public class Session extends RealmObject {
...
@@ -60,13 +61,13 @@ public class Session extends RealmObject {
*/
*/
@DebugLog
@DebugLog
public
static
void
retryLogin
(
RealmHelper
realmHelper
)
{
public
static
void
retryLogin
(
RealmHelper
realmHelper
)
{
final
Session
session
=
realmHelper
.
executeTransactionForRead
(
realm
->
final
Realm
Session
session
=
realmHelper
.
executeTransactionForRead
(
realm
->
queryDefaultSession
(
realm
).
isNotNull
(
TOKEN
).
findFirst
());
queryDefaultSession
(
realm
).
isNotNull
(
TOKEN
).
findFirst
());
if
(!
session
.
isTokenVerified
()
||
!
TextUtils
.
isEmpty
(
session
.
getError
()))
{
if
(!
session
.
isTokenVerified
()
||
!
TextUtils
.
isEmpty
(
session
.
getError
()))
{
realmHelper
.
executeTransaction
(
realmHelper
.
executeTransaction
(
realm
->
realm
.
createOrUpdateObjectFromJson
(
Session
.
class
,
new
JSONObject
()
realm
->
realm
.
createOrUpdateObjectFromJson
(
Realm
Session
.
class
,
new
JSONObject
()
.
put
(
ID
,
Session
.
DEFAULT_ID
)
.
put
(
ID
,
Realm
Session
.
DEFAULT_ID
)
.
put
(
TOKEN_VERIFIED
,
false
)
.
put
(
TOKEN_VERIFIED
,
false
)
.
put
(
ERROR
,
JSONObject
.
NULL
)))
.
put
(
ERROR
,
JSONObject
.
NULL
)))
.
continueWith
(
new
LogcatIfError
());
.
continueWith
(
new
LogcatIfError
());
...
@@ -104,4 +105,13 @@ public class Session extends RealmObject {
...
@@ -104,4 +105,13 @@ public class Session extends RealmObject {
public
void
setError
(
String
error
)
{
public
void
setError
(
String
error
)
{
this
.
error
=
error
;
this
.
error
=
error
;
}
}
public
Session
asSession
()
{
return
Session
.
builder
()
.
setSessionId
(
sessionId
)
.
setToken
(
token
)
.
setTokenVerified
(
tokenVerified
)
.
setError
(
error
)
.
build
();
}
}
}
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSessionRepository.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
persistence
.
realm
.
repositories
;
import
android.os.Looper
;
import
io.realm.Realm
;
import
chat.rocket.core.models.Session
;
import
chat.rocket.core.repositories.SessionRepository
;
import
chat.rocket.persistence.realm.RealmStore
;
import
chat.rocket.persistence.realm.models.internal.RealmSession
;
import
rx.Observable
;
import
rx.android.schedulers.AndroidSchedulers
;
public
class
RealmSessionRepository
extends
RealmRepository
implements
SessionRepository
{
private
final
String
hostname
;
public
RealmSessionRepository
(
String
hostname
)
{
this
.
hostname
=
hostname
;
}
@Override
public
Observable
<
Session
>
getDefault
()
{
return
Observable
.
defer
(()
->
{
final
Realm
realm
=
RealmStore
.
getRealm
(
hostname
);
final
Looper
looper
=
Looper
.
myLooper
();
if
(
realm
==
null
)
{
return
Observable
.
just
(
null
);
}
final
RealmSession
realmSession
=
realm
.
where
(
RealmSession
.
class
).
equalTo
(
RealmSession
.
ID
,
RealmSession
.
DEFAULT_ID
)
.
findFirst
();
if
(
realmSession
==
null
)
{
realm
.
close
();
return
Observable
.
just
(
null
);
}
return
realmSession
.<
RealmSession
>
asObservable
()
.
unsubscribeOn
(
AndroidSchedulers
.
from
(
looper
))
.
doOnUnsubscribe
(()
->
close
(
realm
,
looper
))
.
filter
(
it
->
it
!=
null
&&
it
.
isLoaded
()
&&
it
.
isValid
())
.
map
(
RealmSession:
:
asSession
);
});
}
}
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmUserRepository.java
View file @
772b55bd
...
@@ -19,7 +19,7 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
...
@@ -19,7 +19,7 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
}
}
@Override
@Override
public
Observable
<
User
>
getCurrent
User
()
{
public
Observable
<
User
>
getCurrent
()
{
return
Observable
.
defer
(()
->
{
return
Observable
.
defer
(()
->
{
final
Realm
realm
=
RealmStore
.
getRealm
(
hostname
);
final
Realm
realm
=
RealmStore
.
getRealm
(
hostname
);
final
Looper
looper
=
Looper
.
myLooper
();
final
Looper
looper
=
Looper
.
myLooper
();
...
...
rocket-chat-core/build.gradle
View file @
772b55bd
plugins
{
plugins
{
id
"net.ltgt.apt"
version
"0.9"
id
"net.ltgt.apt"
version
"0.9"
id
"me.tatarka.retrolambda"
version
"3.5.0"
}
}
apply
plugin:
'idea'
apply
plugin:
'idea'
...
@@ -17,5 +18,5 @@ dependencies {
...
@@ -17,5 +18,5 @@ dependencies {
apt
'com.gabrielittner.auto.value:auto-value-with:1.0.0'
apt
'com.gabrielittner.auto.value:auto-value-with:1.0.0'
}
}
sourceCompatibility
=
"1.
7
"
sourceCompatibility
=
"1.
8
"
targetCompatibility
=
"1.
7
"
targetCompatibility
=
"1.
8
"
rocket-chat-core/src/main/java/chat/rocket/core/interactors/CanCreateRoomInteractor.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
core
.
interactors
;
import
chat.rocket.core.repositories.SessionRepository
;
import
chat.rocket.core.repositories.UserRepository
;
import
rx.Observable
;
import
rx.Single
;
public
class
CanCreateRoomInteractor
{
private
final
UserRepository
userRepository
;
private
final
SessionRepository
sessionRepository
;
public
CanCreateRoomInteractor
(
UserRepository
userRepository
,
SessionRepository
sessionRepository
)
{
this
.
userRepository
=
userRepository
;
this
.
sessionRepository
=
sessionRepository
;
}
public
Single
<
Boolean
>
canCreate
(
String
roomId
)
{
return
Observable
.
zip
(
userRepository
.
getCurrent
(),
sessionRepository
.
getDefault
(),
Observable
.
just
(
roomId
),
(
user
,
session
,
room
)
->
user
!=
null
&&
session
!=
null
&&
room
!=
null
)
.
first
()
.
toSingle
();
}
}
rocket-chat-core/src/main/java/chat/rocket/core/models/Session.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
core
.
models
;
import
com.google.auto.value.AutoValue
;
import
javax.annotation.Nullable
;
@AutoValue
public
abstract
class
Session
{
public
abstract
int
getSessionId
();
@Nullable
public
abstract
String
getToken
();
public
abstract
boolean
isTokenVerified
();
@Nullable
public
abstract
String
getError
();
public
static
Builder
builder
()
{
return
new
AutoValue_Session
.
Builder
();
}
@AutoValue
.
Builder
public
abstract
static
class
Builder
{
public
abstract
Builder
setSessionId
(
int
sessionId
);
public
abstract
Builder
setToken
(
String
token
);
public
abstract
Builder
setTokenVerified
(
boolean
tokenVerified
);
public
abstract
Builder
setError
(
String
error
);
public
abstract
Session
build
();
}
}
rocket-chat-core/src/main/java/chat/rocket/core/repositories/SessionRepository.java
0 → 100644
View file @
772b55bd
package
chat
.
rocket
.
core
.
repositories
;
import
chat.rocket.core.models.Session
;
import
rx.Observable
;
public
interface
SessionRepository
{
Observable
<
Session
>
getDefault
();
}
rocket-chat-core/src/main/java/chat/rocket/core/repositories/UserRepository.java
View file @
772b55bd
...
@@ -5,5 +5,5 @@ import rx.Observable;
...
@@ -5,5 +5,5 @@ import rx.Observable;
public
interface
UserRepository
{
public
interface
UserRepository
{
Observable
<
User
>
getCurrent
User
();
Observable
<
User
>
getCurrent
();
}
}
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