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
8161903f
Commit
8161903f
authored
Jul 27, 2017
by
Rafael Kellermann Streit
Committed by
GitHub
Jul 27, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into avatar
parents
a1a6b192
1505793f
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
37 additions
and
37 deletions
+37
-37
RoomFragment.java
...a/chat/rocket/android/fragment/chatroom/RoomFragment.java
+3
-3
RoomPresenter.java
.../chat/rocket/android/fragment/chatroom/RoomPresenter.java
+1
-1
UsersOfRoomDialogFragment.java
...d/fragment/chatroom/dialog/UsersOfRoomDialogFragment.java
+1
-1
LoginPresenter.java
...rocket/android/fragment/server_config/LoginPresenter.java
+1
-1
RetryLoginPresenter.java
...t/android/fragment/server_config/RetryLoginPresenter.java
+1
-1
AddDirectMessageDialogFragment.java
...agment/sidebar/dialog/AddDirectMessageDialogFragment.java
+1
-1
AbsoluteUrlHelper.java
...in/java/chat/rocket/android/helper/AbsoluteUrlHelper.java
+1
-1
RealmLoginServiceConfigurationRepository.java
...epositories/RealmLoginServiceConfigurationRepository.java
+1
-1
RealmMessageRepository.java
...ersistence/realm/repositories/RealmMessageRepository.java
+1
-1
RealmPermissionRepository.java
...istence/realm/repositories/RealmPermissionRepository.java
+1
-1
RealmPublicSettingRepository.java
...ence/realm/repositories/RealmPublicSettingRepository.java
+1
-1
RealmRoomRepository.java
...t/persistence/realm/repositories/RealmRoomRepository.java
+1
-1
RealmRoomRoleRepository.java
...rsistence/realm/repositories/RealmRoomRoleRepository.java
+1
-1
RealmServerInfoRepository.java
...istence/realm/repositories/RealmServerInfoRepository.java
+1
-1
RealmSessionRepository.java
...ersistence/realm/repositories/RealmSessionRepository.java
+1
-1
RealmUserRepository.java
...t/persistence/realm/repositories/RealmUserRepository.java
+1
-1
build.gradle
rocket-chat-core/build.gradle
+3
-3
CanCreateRoomInteractor.kt
...a/chat/rocket/core/interactors/CanCreateRoomInteractor.kt
+1
-1
EditMessageInteractor.kt
...ava/chat/rocket/core/interactors/EditMessageInteractor.kt
+1
-1
MessageInteractor.kt
...in/java/chat/rocket/core/interactors/MessageInteractor.kt
+1
-1
PermissionInteractor.kt
...java/chat/rocket/core/interactors/PermissionInteractor.kt
+1
-1
SessionInteractor.kt
...in/java/chat/rocket/core/interactors/SessionInteractor.kt
+1
-1
LoginServiceConfigurationRepository.java
...ore/repositories/LoginServiceConfigurationRepository.java
+1
-1
MessageRepository.java
...java/chat/rocket/core/repositories/MessageRepository.java
+1
-1
PermissionRepository.java
...a/chat/rocket/core/repositories/PermissionRepository.java
+1
-1
PublicSettingRepository.java
...hat/rocket/core/repositories/PublicSettingRepository.java
+1
-1
RoomRepository.java
...in/java/chat/rocket/core/repositories/RoomRepository.java
+1
-1
RoomRoleRepository.java
...ava/chat/rocket/core/repositories/RoomRoleRepository.java
+1
-1
ServerInfoRepository.java
...a/chat/rocket/core/repositories/ServerInfoRepository.java
+1
-1
SessionRepository.java
...java/chat/rocket/core/repositories/SessionRepository.java
+1
-1
UserRepository.java
...in/java/chat/rocket/core/repositories/UserRepository.java
+1
-1
EditMessageInteractorTest.kt
...chat/rocket/core/interactors/EditMessageInteractorTest.kt
+1
-1
PermissionInteractorTest.kt
.../chat/rocket/core/interactors/PermissionInteractorTest.kt
+1
-1
No files found.
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java
View file @
8161903f
...
...
@@ -22,9 +22,6 @@ import android.support.v7.widget.RecyclerView;
import
android.view.View
;
import
android.view.ViewGroup
;
import
com.fernandocejas.arrow.optional.Optional
;
import
com.jakewharton.rxbinding2.support.v4.widget.RxDrawerLayout
;
import
java.lang.reflect.Field
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -78,6 +75,9 @@ import chat.rocket.persistence.realm.repositories.RealmSessionRepository;
import
chat.rocket.persistence.realm.repositories.RealmSpotlightRoomRepository
;
import
chat.rocket.persistence.realm.repositories.RealmSpotlightUserRepository
;
import
chat.rocket.persistence.realm.repositories.RealmUserRepository
;
import
com.hadisatrio.optional.Optional
;
import
com.jakewharton.rxbinding2.support.v4.widget.RxDrawerLayout
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
io.reactivex.disposables.CompositeDisposable
;
...
...
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomPresenter.java
View file @
8161903f
...
...
@@ -4,7 +4,7 @@ import android.support.annotation.NonNull;
import
android.support.annotation.Nullable
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
io.reactivex.disposables.Disposable
;
...
...
app/src/main/java/chat/rocket/android/fragment/chatroom/dialog/UsersOfRoomDialogFragment.java
View file @
8161903f
...
...
@@ -7,7 +7,7 @@ import android.support.v7.widget.GridLayoutManager;
import
android.support.v7.widget.RecyclerView
;
import
android.view.View
;
import
android.widget.TextView
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
io.reactivex.disposables.CompositeDisposable
;
import
org.json.JSONArray
;
...
...
app/src/main/java/chat/rocket/android/fragment/server_config/LoginPresenter.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.android.fragment.server_config;
import
android.support.annotation.NonNull
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
bolts.Task
;
...
...
app/src/main/java/chat/rocket/android/fragment/server_config/RetryLoginPresenter.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.android.fragment.server_config;
import
android.support.annotation.NonNull
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
chat.rocket.android.BackgroundLooper
;
...
...
app/src/main/java/chat/rocket/android/fragment/sidebar/dialog/AddDirectMessageDialogFragment.java
View file @
8161903f
...
...
@@ -5,7 +5,7 @@ import android.os.Bundle;
import
android.view.View
;
import
android.widget.AutoCompleteTextView
;
import
android.widget.TextView
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
com.jakewharton.rxbinding2.widget.RxTextView
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
io.reactivex.disposables.CompositeDisposable
;
...
...
app/src/main/java/chat/rocket/android/helper/AbsoluteUrlHelper.java
View file @
8161903f
package
chat
.
rocket
.
android
.
helper
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmLoginServiceConfigurationRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmMessageRepository.java
View file @
8161903f
...
...
@@ -3,7 +3,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmPermissionRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmPublicSettingRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmRoomRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmRoomRoleRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmServerInfoRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSessionRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmUserRepository.java
View file @
8161903f
...
...
@@ -2,7 +2,7 @@ package chat.rocket.persistence.realm.repositories;
import
android.os.Looper
;
import
android.support.v4.util.Pair
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
io.realm.Case
;
...
...
rocket-chat-core/build.gradle
View file @
8161903f
plugins
{
id
"org.jetbrains.kotlin.jvm"
version
"1.1.
2
-2"
id
"org.jetbrains.kotlin.jvm"
version
"1.1.
3
-2"
}
apply
plugin:
'idea'
...
...
@@ -14,9 +14,9 @@ dependencies {
compile
'io.reactivex.rxjava2:rxjava:2.1.0'
compile
'com.
fernandocejas:arrow:1.0.0
'
compile
'com.
hadisatrio:Optional:v1.0.1
'
compile
'com.google.auto.value:auto-value:1.3'
compile
Only
'com.google.auto.value:auto-value:1.3'
kapt
'com.google.auto.value:auto-value:1.3'
kapt
'com.gabrielittner.auto.value:auto-value-with:1.0.0'
...
...
rocket-chat-core/src/main/java/chat/rocket/core/interactors/CanCreateRoomInteractor.kt
View file @
8161903f
...
...
@@ -6,7 +6,7 @@ import io.reactivex.Flowable
import
io.reactivex.Single
import
chat.rocket.core.repositories.UserRepository
import
com.
fernandocejas.arrow
.optional.Optional
import
com.
hadisatrio
.optional.Optional
import
io.reactivex.functions.Function3
class
CanCreateRoomInteractor
(
private
val
userRepository
:
UserRepository
,
...
...
rocket-chat-core/src/main/java/chat/rocket/core/interactors/EditMessageInteractor.kt
View file @
8161903f
...
...
@@ -5,7 +5,7 @@ import chat.rocket.core.PublicSettingsConstants
import
chat.rocket.core.models.*
import
chat.rocket.core.repositories.*
import
chat.rocket.core.utils.Pair
import
com.
fernandocejas.arrow
.optional.Optional
import
com.
hadisatrio
.optional.Optional
import
io.reactivex.Single
import
io.reactivex.functions.Function4
...
...
rocket-chat-core/src/main/java/chat/rocket/core/interactors/MessageInteractor.kt
View file @
8161903f
package
chat.rocket.core.interactors
import
com.
fernandocejas.arrow
.optional.Optional
import
com.
hadisatrio
.optional.Optional
import
io.reactivex.Flowable
import
io.reactivex.Single
import
java.util.UUID
...
...
rocket-chat-core/src/main/java/chat/rocket/core/interactors/PermissionInteractor.kt
View file @
8161903f
...
...
@@ -5,7 +5,7 @@ import chat.rocket.core.models.Room
import
chat.rocket.core.models.RoomRole
import
chat.rocket.core.repositories.*
import
chat.rocket.core.utils.Pair
import
com.
fernandocejas.arrow
.optional.Optional
import
com.
hadisatrio
.optional.Optional
import
io.reactivex.Single
import
io.reactivex.functions.BiFunction
...
...
rocket-chat-core/src/main/java/chat/rocket/core/interactors/SessionInteractor.kt
View file @
8161903f
package
chat.rocket.core.interactors
import
com.
fernandocejas.arrow
.optional.Optional
import
com.
hadisatrio
.optional.Optional
import
io.reactivex.Flowable
import
io.reactivex.Single
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/LoginServiceConfigurationRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/MessageRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/PermissionRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Single
;
import
chat.rocket.core.models.Permission
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/PublicSettingRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Single
;
import
chat.rocket.core.models.PublicSetting
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/RoomRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/RoomRoleRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Single
;
import
chat.rocket.core.models.Room
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/ServerInfoRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/SessionRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
io.reactivex.Single
;
...
...
rocket-chat-core/src/main/java/chat/rocket/core/repositories/UserRepository.java
View file @
8161903f
package
chat
.
rocket
.
core
.
repositories
;
import
com.
fernandocejas.arrow
.optional.Optional
;
import
com.
hadisatrio
.optional.Optional
;
import
io.reactivex.Flowable
;
import
java.util.List
;
...
...
rocket-chat-core/src/test/java/chat/rocket/core/interactors/EditMessageInteractorTest.kt
View file @
8161903f
...
...
@@ -7,7 +7,7 @@ import chat.rocket.core.models.PublicSetting
import
chat.rocket.core.models.Room
import
chat.rocket.core.models.User
import
chat.rocket.core.repositories.*
import
com.
fernandocejas.arrow
.optional.Optional
import
com.
hadisatrio
.optional.Optional
import
io.reactivex.Flowable
import
io.reactivex.Single
import
io.reactivex.observers.TestObserver
...
...
rocket-chat-core/src/test/java/chat/rocket/core/interactors/PermissionInteractorTest.kt
View file @
8161903f
...
...
@@ -4,7 +4,7 @@ import chat.rocket.core.models.*
import
chat.rocket.core.repositories.PermissionRepository
import
chat.rocket.core.repositories.RoomRoleRepository
import
chat.rocket.core.repositories.UserRepository
import
com.
fernandocejas.arrow
.optional.Optional
import
com.
hadisatrio
.optional.Optional
import
io.reactivex.Flowable
import
io.reactivex.Single
import
io.reactivex.observers.TestObserver
...
...
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