Commit cbda8984 authored by Leonardo Aramaki's avatar Leonardo Aramaki

Refactor indentation

parent 49c0e63b
...@@ -18,81 +18,81 @@ import chat.rocket.core.repositories.PublicSettingRepository; ...@@ -18,81 +18,81 @@ import chat.rocket.core.repositories.PublicSettingRepository;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
public class LoginPresenter extends BasePresenter<LoginContract.View> public class LoginPresenter extends BasePresenter<LoginContract.View>
implements LoginContract.Presenter { implements LoginContract.Presenter {
private final LoginServiceConfigurationRepository loginServiceConfigurationRepository; private final LoginServiceConfigurationRepository loginServiceConfigurationRepository;
private final PublicSettingRepository publicSettingRepository; private final PublicSettingRepository publicSettingRepository;
private final MethodCallHelper methodCallHelper; private final MethodCallHelper methodCallHelper;
public LoginPresenter(LoginServiceConfigurationRepository loginServiceConfigurationRepository, public LoginPresenter(LoginServiceConfigurationRepository loginServiceConfigurationRepository,
PublicSettingRepository publicSettingRepository, PublicSettingRepository publicSettingRepository,
MethodCallHelper methodCallHelper) { MethodCallHelper methodCallHelper) {
this.loginServiceConfigurationRepository = loginServiceConfigurationRepository; this.loginServiceConfigurationRepository = loginServiceConfigurationRepository;
this.publicSettingRepository = publicSettingRepository; this.publicSettingRepository = publicSettingRepository;
this.methodCallHelper = methodCallHelper; this.methodCallHelper = methodCallHelper;
}
@Override
public void bindView(@NonNull LoginContract.View view) {
super.bindView(view);
getLoginServices();
}
@Override
public void login(String username, String password) {
if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) {
return;
} }
view.showLoader(); @Override
public void bindView(@NonNull LoginContract.View view) {
addSubscription( super.bindView(view);
publicSettingRepository.getById(PublicSettingsConstants.LDAP.ENABLE)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) getLoginServices();
.observeOn(AndroidSchedulers.mainThread()) }
.subscribe(
publicSettingOptional -> doLogin(username, password, publicSettingOptional), @Override
Logger::report public void login(String username, String password) {
) if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) {
); return;
} }
private void getLoginServices() { view.showLoader();
addSubscription(
loginServiceConfigurationRepository.getAll() addSubscription(
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) publicSettingRepository.getById(PublicSettingsConstants.LDAP.ENABLE)
.observeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.subscribe( .observeOn(AndroidSchedulers.mainThread())
loginServiceConfigurations -> view.showLoginServices(loginServiceConfigurations), .subscribe(
Logger::report publicSettingOptional -> doLogin(username, password, publicSettingOptional),
) Logger::report
); )
} );
}
private void doLogin(String username, String password, Optional<PublicSetting> optional) {
call(username, password, optional) private void getLoginServices() {
.continueWith(task -> { addSubscription(
if (task.isFaulted()) { loginServiceConfigurationRepository.getAll()
view.hideLoader(); .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread())
final Exception error = task.getError(); .subscribe(
loginServiceConfigurations -> view.showLoginServices(loginServiceConfigurations),
if (error instanceof TwoStepAuthException) { Logger::report
view.showTwoStepAuth(); )
} else { );
view.showError(error.getMessage());
}
}
return null;
}, Task.UI_THREAD_EXECUTOR);
}
private Task<Void> call(String username, String password, Optional<PublicSetting> optional) {
if (optional.isPresent() && optional.get().getValueAsBoolean()) {
return methodCallHelper.loginWithLdap(username, password);
} }
return methodCallHelper.loginWithEmail(username, password); private void doLogin(String username, String password, Optional<PublicSetting> optional) {
} call(username, password, optional)
.continueWith(task -> {
if (task.isFaulted()) {
view.hideLoader();
final Exception error = task.getError();
if (error instanceof TwoStepAuthException) {
view.showTwoStepAuth();
} else {
view.showError(error.getMessage());
}
}
return null;
}, Task.UI_THREAD_EXECUTOR);
}
private Task<Void> call(String username, String password, Optional<PublicSetting> optional) {
if (optional.isPresent() && optional.get().getValueAsBoolean()) {
return methodCallHelper.loginWithLdap(username, password);
}
return methodCallHelper.loginWithEmail(username, password);
}
} }
...@@ -12,7 +12,6 @@ import bolts.Task; ...@@ -12,7 +12,6 @@ import bolts.Task;
import chat.rocket.android.BackgroundLooper; import chat.rocket.android.BackgroundLooper;
import chat.rocket.android.RocketChatApplication; import chat.rocket.android.RocketChatApplication;
import chat.rocket.android.RocketChatCache; import chat.rocket.android.RocketChatCache;
import chat.rocket.android.activity.MainActivity;
import chat.rocket.android.api.MethodCallHelper; import chat.rocket.android.api.MethodCallHelper;
import chat.rocket.android.helper.AbsoluteUrlHelper; import chat.rocket.android.helper.AbsoluteUrlHelper;
import chat.rocket.android.helper.LogIfError; import chat.rocket.android.helper.LogIfError;
...@@ -243,11 +242,11 @@ public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View ...@@ -243,11 +242,11 @@ public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(this::processUsers, Logger::report); .subscribe(this::processUsers, Logger::report);
addSubscription(subscription); addSubscription(subscription);
} }
private void processUsers(List<User> userList) { private void processUsers(List<User> userList) {
for (User user: userList) { for (User user : userList) {
for(RoomSidebar roomSidebar: roomSidebarList) { for (RoomSidebar roomSidebar : roomSidebarList) {
if (roomSidebar.getRoomName().equals(user.getUsername())) { if (roomSidebar.getRoomName().equals(user.getUsername())) {
roomSidebar.setUserStatus(user.getStatus()); roomSidebar.setUserStatus(user.getStatus());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment