Merge branch 'develop' into avatar

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 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'
+    compileOnly '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

@@ -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

@@ -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

 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

@@ -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

 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

 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

 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

 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

 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

 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

 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

 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

 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

 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

@@ -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

@@ -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