Skip to content

A
AloqaIM-Android
Commit cf18e7f8 authored by Leonardo Aramaki's avatar Leonardo Aramaki
Browse files
Options

Implement go back action from LoginActivity to fix the user getting locked at this screen

parent b1514363
Show whitespace changes
Inline Side-by-side
Showing with 547 additions and 446 deletions
app/src/main/java/chat/rocket/android/RocketChatCache.java
View file @ cf18e7f8
...@@ -2,10 +2,13 @@ package chat.rocket.android; ...@@ -2,10 +2,13 @@ package chat.rocket.android;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.support.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import com.hadisatrio.optional.Optional; import com.hadisatrio.optional.Optional;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -20,8 +23,6 @@ import chat.rocket.android.log.RCLog; ...@@ -20,8 +23,6 @@ import chat.rocket.android.log.RCLog;
import chat.rocket.core.utils.Pair; import chat.rocket.core.utils.Pair;
import io.reactivex.BackpressureStrategy; import io.reactivex.BackpressureStrategy;
import io.reactivex.Flowable; import io.reactivex.Flowable;
import io.reactivex.annotations.NonNull;
import io.reactivex.annotations.Nullable;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
/** /**
...@@ -38,13 +39,12 @@ public class RocketChatCache { ...@@ -38,13 +39,12 @@ public class RocketChatCache {
private static final String KEY_SESSION_TOKEN = "KEY_SESSION_TOKEN"; private static final String KEY_SESSION_TOKEN = "KEY_SESSION_TOKEN";
private Context context; private Context context;
private String session;
public RocketChatCache(Context context) { public RocketChatCache(Context context) {
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
} }
public void addOpenedRoom(@NonNull String roomId, long lastSeen) { public void addOpenedRoom(@NotNull String roomId, long lastSeen) {
JSONObject openedRooms = getOpenedRooms(); JSONObject openedRooms = getOpenedRooms();
try { try {
JSONObject room = new JSONObject().put("rid", roomId).put("ls", lastSeen); JSONObject room = new JSONObject().put("rid", roomId).put("ls", lastSeen);
...@@ -55,15 +55,15 @@ public class RocketChatCache { ...@@ -55,15 +55,15 @@ public class RocketChatCache {
setString(KEY_OPENED_ROOMS, openedRooms.toString()); setString(KEY_OPENED_ROOMS, openedRooms.toString());
} }
public void removeOpenedRoom(@NonNull String roomId) { public void removeOpenedRoom(@NotNull String roomId) {
JSONObject openedRooms = getOpenedRooms(); JSONObject openedRooms = getOpenedRooms();
if (openedRooms.has(roomId)) { if (openedRooms.has(roomId)) {
openedRooms.remove(roomId); openedRooms.remove(roomId);
} }
} }
public @NonNull @NotNull
JSONObject getOpenedRooms() { public JSONObject getOpenedRooms() {
String openedRooms = getString(KEY_OPENED_ROOMS, ""); String openedRooms = getString(KEY_OPENED_ROOMS, "");
if (openedRooms.isEmpty()) { if (openedRooms.isEmpty()) {
return new JSONObject(); return new JSONObject();
...@@ -88,9 +88,9 @@ public class RocketChatCache { ...@@ -88,9 +88,9 @@ public class RocketChatCache {
setString(KEY_SELECTED_SERVER_HOSTNAME, newHostname); setString(KEY_SELECTED_SERVER_HOSTNAME, newHostname);
} }
public void addHostSiteName(@NonNull String currentHostname, @NonNull String siteName) { public void addSiteName(@NotNull String currentHostname, @NotNull String siteName) {
try { try {
String hostSiteNamesJson = getHostSiteNamesJson(); String hostSiteNamesJson = getSiteName();
JSONObject jsonObject = (hostSiteNamesJson == null) ? JSONObject jsonObject = (hostSiteNamesJson == null) ?
new JSONObject() : new JSONObject(hostSiteNamesJson); new JSONObject() : new JSONObject(hostSiteNamesJson);
jsonObject.put(currentHostname, siteName); jsonObject.put(currentHostname, siteName);
...@@ -100,8 +100,22 @@ public class RocketChatCache { ...@@ -100,8 +100,22 @@ public class RocketChatCache {
} }
} }
public @NonNull public void removeSiteName(@NotNull String hostname) {
String getHostSiteName(@NonNull String host) { try {
String siteNameJson = getSiteName();
JSONObject jsonObject = (siteNameJson == null) ?
new JSONObject() : new JSONObject(siteNameJson);
if (jsonObject.has(hostname)) {
jsonObject.remove(hostname);
}
setString(KEY_SELECTED_SITE_NAME, jsonObject.toString());
} catch (JSONException e) {
RCLog.e(e);
}
}
@NotNull
public String getHostSiteName(@NotNull String host) {
if (host.startsWith("http")) { if (host.startsWith("http")) {
HttpUrl url = HttpUrl.parse(host); HttpUrl url = HttpUrl.parse(host);
if (url != null) { if (url != null) {
...@@ -109,7 +123,7 @@ public class RocketChatCache { ...@@ -109,7 +123,7 @@ public class RocketChatCache {
} }
} }
try { try {
String hostSiteNamesJson = getHostSiteNamesJson(); String hostSiteNamesJson = getSiteName();
JSONObject jsonObject = (hostSiteNamesJson == null) ? JSONObject jsonObject = (hostSiteNamesJson == null) ?
new JSONObject() : new JSONObject(hostSiteNamesJson); new JSONObject() : new JSONObject(hostSiteNamesJson);
host = getSiteUrlFor(host); host = getSiteUrlFor(host);
...@@ -120,18 +134,18 @@ public class RocketChatCache { ...@@ -120,18 +134,18 @@ public class RocketChatCache {
return ""; return "";
} }
private @Nullable @Nullable
String getHostSiteNamesJson() { private String getSiteName() {
return getString(KEY_SELECTED_SITE_NAME, null); return getString(KEY_SELECTED_SITE_NAME, null);
} }
public void addHostnameSiteUrl(@Nullable String hostnameAlias, @NonNull String currentHostname) { public void addSiteUrl(@Nullable String hostnameAlias, @NotNull String currentHostname) {
String alias = null; String alias = null;
if (hostnameAlias != null) { if (hostnameAlias != null) {
alias = hostnameAlias.toLowerCase(); alias = hostnameAlias.toLowerCase();
} }
try { try {
String selectedHostnameAliasJson = getLoginHostnamesJson(); String selectedHostnameAliasJson = getSiteUrlForAllServers();
JSONObject jsonObject = selectedHostnameAliasJson == null ? JSONObject jsonObject = selectedHostnameAliasJson == null ?
new JSONObject() : new JSONObject(selectedHostnameAliasJson); new JSONObject() : new JSONObject(selectedHostnameAliasJson);
jsonObject.put(alias, currentHostname); jsonObject.put(alias, currentHostname);
...@@ -141,14 +155,33 @@ public class RocketChatCache { ...@@ -141,14 +155,33 @@ public class RocketChatCache {
} }
} }
public @Nullable private void removeSiteUrl(@NotNull String hostname) {
String getSiteUrlFor(String hostname) { try {
String siteUrlForAllServersJson = getSiteUrlForAllServers();
JSONObject jsonObject = siteUrlForAllServersJson == null ?
new JSONObject() : new JSONObject(siteUrlForAllServersJson);
Iterator<String> keys = jsonObject.keys();
while (keys.hasNext()) {
String alias = keys.next();
if (hostname.equals(jsonObject.getString(alias))) {
jsonObject.remove(alias);
break;
}
}
setString(KEY_SELECTED_SITE_URL, jsonObject.toString());
} catch (JSONException e) {
RCLog.e(e);
}
}
@Nullable
public String getSiteUrlFor(String hostname) {
try { try {
String selectedServerHostname = getSelectedServerHostname(); String selectedServerHostname = getSelectedServerHostname();
if (getLoginHostnamesJson() == null || getLoginHostnamesJson().isEmpty()) { if (getSiteUrlForAllServers() == null || getSiteUrlForAllServers().isEmpty()) {
return null; return null;
} }
return new JSONObject(getLoginHostnamesJson()) return new JSONObject(getSiteUrlForAllServers())
.optString(hostname, selectedServerHostname); .optString(hostname, selectedServerHostname);
} catch (JSONException e) { } catch (JSONException e) {
RCLog.e(e); RCLog.e(e);
...@@ -156,12 +189,12 @@ public class RocketChatCache { ...@@ -156,12 +189,12 @@ public class RocketChatCache {
return null; return null;
} }
private @Nullable @Nullable
String getLoginHostnamesJson() { private String getSiteUrlForAllServers() {
return getString(KEY_SELECTED_SITE_URL, null); return getString(KEY_SELECTED_SITE_URL, null);
} }
public void addHostname(@NonNull String hostname, @Nullable String hostnameAvatarUri, String siteName) { public void addHostname(@NotNull String hostname, @Nullable String hostnameAvatarUri, String siteName) {
String hostnameList = getString(KEY_HOSTNAME_LIST, null); String hostnameList = getString(KEY_HOSTNAME_LIST, null);
try { try {
JSONObject json; JSONObject json;
...@@ -257,6 +290,7 @@ public class RocketChatCache { ...@@ -257,6 +290,7 @@ public class RocketChatCache {
} }
} }
@NonNull
private JSONObject getSelectedRoomIdJsonObject() throws JSONException { private JSONObject getSelectedRoomIdJsonObject() throws JSONException {
String json = getString(KEY_SELECTED_ROOM_ID, null); String json = getString(KEY_SELECTED_ROOM_ID, null);
if (json == null) { if (json == null) {
...@@ -367,4 +401,17 @@ public class RocketChatCache { ...@@ -367,4 +401,17 @@ public class RocketChatCache {
return null; return null;
} }
/**
* Wipe all given hostname entries and references from cache.
*/
public void clearSelectedHostnameReferences() {
String hostname = getSelectedServerHostname();
if (hostname != null) {
removeSiteName(hostname);
removeHostname(hostname);
removeSiteUrl(hostname);
setSelectedServerHostname(null);
}
}
} }
app/src/main/java/chat/rocket/android/api/MethodCallHelper.java
View file @ cf18e7f8
...@@ -512,8 +512,8 @@ public class MethodCallHelper { ...@@ -512,8 +512,8 @@ public class MethodCallHelper {
if (httpSiteUrl != null) { if (httpSiteUrl != null) {
String host = httpSiteUrl.host(); String host = httpSiteUrl.host();
RocketChatCache rocketChatCache = new RocketChatCache(context); RocketChatCache rocketChatCache = new RocketChatCache(context);
rocketChatCache.addHostnameSiteUrl(host, currentHostname); rocketChatCache.addSiteUrl(host, currentHostname);
rocketChatCache.addHostSiteName(currentHostname, siteName); rocketChatCache.addSiteName(currentHostname, siteName);
} }
} }
......
app/src/main/java/chat/rocket/android/fragment/chatroom/AbstractChatRoomFragment.java
View file @ cf18e7f8
...@@ -11,7 +11,7 @@ import chat.rocket.android.fragment.AbstractFragment; ...@@ -11,7 +11,7 @@ import chat.rocket.android.fragment.AbstractFragment;
import chat.rocket.android.widget.RoomToolbar; import chat.rocket.android.widget.RoomToolbar;
import chat.rocket.core.models.User; import chat.rocket.core.models.User;
abstract class AbstractChatRoomFragment extends AbstractFragment { public abstract class AbstractChatRoomFragment extends AbstractFragment {
private RoomToolbar roomToolbar; private RoomToolbar roomToolbar;
@Nullable @Nullable
......
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java
View file @ cf18e7f8
...@@ -131,7 +131,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -131,7 +131,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
private MethodCallHelper methodCallHelper; private MethodCallHelper methodCallHelper;
private AbsoluteUrlHelper absoluteUrlHelper; private AbsoluteUrlHelper absoluteUrlHelper;
private Message edittingMessage = null; private Message editingMessage = null;
private RoomToolbar toolbar; private RoomToolbar toolbar;
...@@ -344,7 +344,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -344,7 +344,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
optionalPane.ifPresent(pane -> pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() { optionalPane.ifPresent(pane -> pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
@Override @Override
public void onPanelSlide(View view, float v) { public void onPanelSlide(@NonNull View view, float v) {
messageFormManager.enableComposingText(false); messageFormManager.enableComposingText(false);
sidebarFragment.clearSearchViewFocus(); sidebarFragment.clearSearchViewFocus();
//Ref: ActionBarDrawerToggle#setProgress //Ref: ActionBarDrawerToggle#setProgress
...@@ -352,12 +352,12 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -352,12 +352,12 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
@Override @Override
public void onPanelOpened(View view) { public void onPanelOpened(@NonNull View view) {
toolbar.setNavigationIconVerticalMirror(true); toolbar.setNavigationIconVerticalMirror(true);
} }
@Override @Override
public void onPanelClosed(View view) { public void onPanelClosed(@NonNull View view) {
messageFormManager.enableComposingText(true); messageFormManager.enableComposingText(true);
toolbar.setNavigationIconVerticalMirror(false); toolbar.setNavigationIconVerticalMirror(false);
subPane.closePane(); subPane.closePane();
...@@ -487,8 +487,8 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -487,8 +487,8 @@ public class RoomFragment extends AbstractChatRoomFragment implements
@Override @Override
public boolean onBackPressed() { public boolean onBackPressed() {
if (edittingMessage != null) { if (editingMessage != null) {
edittingMessage = null; editingMessage = null;
messageFormManager.clearComposingText(); messageFormManager.clearComposingText();
} }
return false; return false;
...@@ -547,15 +547,15 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -547,15 +547,15 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
private void sendMessage(String messageText) { private void sendMessage(String messageText) {
if (edittingMessage == null) { if (editingMessage == null) {
presenter.sendMessage(messageText); presenter.sendMessage(messageText);
} else { } else {
presenter.updateMessage(edittingMessage, messageText); presenter.updateMessage(editingMessage, messageText);
} }
} }
@Override @Override
public void setupWith(RocketChatAbsoluteUrl rocketChatAbsoluteUrl) { public void setupWith(@NonNull RocketChatAbsoluteUrl rocketChatAbsoluteUrl) {
if (rocketChatAbsoluteUrl != null) { if (rocketChatAbsoluteUrl != null) {
token = rocketChatAbsoluteUrl.getToken(); token = rocketChatAbsoluteUrl.getToken();
userId = rocketChatAbsoluteUrl.getUserId(); userId = rocketChatAbsoluteUrl.getUserId();
...@@ -564,7 +564,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -564,7 +564,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
@Override @Override
public void render(Room room) { public void render(@NonNull Room room) {
roomType = room.getType(); roomType = room.getType();
setToolbarTitle(room.getName()); setToolbarTitle(room.getName());
...@@ -589,7 +589,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -589,7 +589,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
@Override @Override
public void showUserStatus(User user) { public void showUserStatus(@NonNull User user) {
showToolbarUserStatuslIcon(user.getStatus()); showToolbarUserStatuslIcon(user.getStatus());
} }
...@@ -610,7 +610,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -610,7 +610,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
public void onMessageSendSuccessfully() { public void onMessageSendSuccessfully() {
scrollToLatestMessage(); scrollToLatestMessage();
messageFormManager.onMessageSend(); messageFormManager.onMessageSend();
edittingMessage = null; editingMessage = null;
} }
@Override @Override
...@@ -629,15 +629,16 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -629,15 +629,16 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
@Override @Override
public void showMessages(List<Message> messages) { public void showMessages(@NonNull List<? extends Message> messages) {
if (messageListAdapter == null) { if (messageListAdapter == null) {
return; return;
} }
messageListAdapter.updateData(messages);
messageListAdapter.updateData((List<Message>) messages);
} }
@Override @Override
public void showMessageSendFailure(Message message) { public void showMessageSendFailure(@NonNull Message message) {
new AlertDialog.Builder(getContext()) new AlertDialog.Builder(getContext())
.setPositiveButton(R.string.resend, .setPositiveButton(R.string.resend,
(dialog, which) -> presenter.resendMessage(message)) (dialog, which) -> presenter.resendMessage(message))
...@@ -648,7 +649,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -648,7 +649,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
@Override @Override
public void showMessageDeleteFailure(Message message) { public void showMessageDeleteFailure(@NonNull Message message) {
new AlertDialog.Builder(getContext()) new AlertDialog.Builder(getContext())
.setTitle(getContext().getString(R.string.failed_to_delete)) .setTitle(getContext().getString(R.string.failed_to_delete))
.setMessage(getContext().getString(R.string.failed_to_delete_message)) .setMessage(getContext().getString(R.string.failed_to_delete_message))
...@@ -667,12 +668,12 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -667,12 +668,12 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
@Override @Override
public void onReply(AbsoluteUrl absoluteUrl, String markdown, Message message) { public void onReply(@NonNull AbsoluteUrl absoluteUrl, @NonNull String markdown, @NonNull Message message) {
messageFormManager.setReply(absoluteUrl, markdown, message); messageFormManager.setReply(absoluteUrl, markdown, message);
} }
@Override @Override
public void onCopy(String message) { public void onCopy(@NonNull String message) {
RocketChatApplication context = RocketChatApplication.getInstance(); RocketChatApplication context = RocketChatApplication.getInstance();
ClipboardManager clipboardManager = ClipboardManager clipboardManager =
(ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
...@@ -680,7 +681,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -680,7 +681,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
@Override @Override
public void showMessageActions(Message message) { public void showMessageActions(@NonNull Message message) {
Activity context = getActivity(); Activity context = getActivity();
if (context != null && context instanceof MainActivity) { if (context != null && context instanceof MainActivity) {
MessagePopup.take(message) MessagePopup.take(message)
...@@ -694,7 +695,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements ...@@ -694,7 +695,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
} }
private void onEditMessage(Message message) { private void onEditMessage(Message message) {
edittingMessage = message; editingMessage = message;
messageFormManager.setEditMessage(message.getMessage()); messageFormManager.setEditMessage(message.getMessage());
} }
......
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomPresenter.java
View file @ cf18e7f8
package chat.rocket.android.fragment.chatroom package chat.rocket.android.fragment.chatroom;
import android.support.v4.util.Pair import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.hadisatrio.optional.Optional import android.support.v4.util.Pair;
import org.json.JSONException import com.hadisatrio.optional.Optional;
import org.json.JSONObject
import org.json.JSONException;
import chat.rocket.android.BackgroundLooper import org.json.JSONObject;
import chat.rocket.android.RocketChatApplication
import chat.rocket.android.RocketChatCache import chat.rocket.android.BackgroundLooper;
import chat.rocket.android.api.MethodCallHelper import chat.rocket.android.RocketChatApplication;
import chat.rocket.android.helper.AbsoluteUrlHelper import chat.rocket.android.RocketChatCache;
import chat.rocket.android.helper.LogIfError import chat.rocket.android.api.MethodCallHelper;
import chat.rocket.android.helper.Logger import chat.rocket.android.helper.AbsoluteUrlHelper;
import chat.rocket.android.log.RCLog import chat.rocket.android.helper.LogIfError;
import chat.rocket.android.service.ConnectivityManagerApi import chat.rocket.android.helper.Logger;
import chat.rocket.android.shared.BasePresenter import chat.rocket.android.log.RCLog;
import chat.rocket.core.SyncState import chat.rocket.android.service.ConnectivityManagerApi;
import chat.rocket.core.interactors.MessageInteractor import chat.rocket.android.shared.BasePresenter;
import chat.rocket.core.models.Message import chat.rocket.core.SyncState;
import chat.rocket.core.models.Room import chat.rocket.core.interactors.MessageInteractor;
import chat.rocket.core.models.Settings import chat.rocket.core.models.Message;
import chat.rocket.core.models.User import chat.rocket.core.models.Room;
import chat.rocket.core.repositories.RoomRepository import chat.rocket.core.models.Settings;
import chat.rocket.core.repositories.UserRepository import chat.rocket.core.models.User;
import io.reactivex.Flowable import chat.rocket.core.repositories.RoomRepository;
import io.reactivex.Single import chat.rocket.core.repositories.UserRepository;
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.Flowable;
import io.reactivex.disposables.Disposable import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
class RoomPresenter/* package */ internal constructor(private val roomId: String, import io.reactivex.disposables.Disposable;
private val userRepository: UserRepository,
private val messageInteractor: MessageInteractor, public class RoomPresenter extends BasePresenter<RoomContract.View>
private val roomRepository: RoomRepository, implements RoomContract.Presenter {
private val absoluteUrlHelper: AbsoluteUrlHelper,
private val methodCallHelper: MethodCallHelper, private final String roomId;
private val connectivityManagerApi: ConnectivityManagerApi) : BasePresenter<RoomContract.View>(), RoomContract.Presenter { private final MessageInteractor messageInteractor;
private var currentRoom: Room? = null private final UserRepository userRepository;
private final RoomRepository roomRepository;
private val roomUserPair: Single<Pair<Room, User>> private final AbsoluteUrlHelper absoluteUrlHelper;
get() = Single.zip( private final MethodCallHelper methodCallHelper;
singleRoom, private final ConnectivityManagerApi connectivityManagerApi;
currentUser, private Room currentRoom;
BiFunction<Room, User, Pair<Room, User>> { first, second -> Pair(first, second) }
) /* package */RoomPresenter(String roomId,
UserRepository userRepository,
private val singleRoom: Single<Room> MessageInteractor messageInteractor,
get() = roomRepository.getById(roomId) RoomRepository roomRepository,
.filter(Predicate<Optional<Room>> { it.isPresent() }) AbsoluteUrlHelper absoluteUrlHelper,
.map<Room>(Function<Optional<Room>, Room> { it.get() }) MethodCallHelper methodCallHelper,
.firstElement() ConnectivityManagerApi connectivityManagerApi) {
.toSingle() this.roomId = roomId;
this.userRepository = userRepository;
private val currentUser: Single<User> this.messageInteractor = messageInteractor;
get() = userRepository.getCurrent() this.roomRepository = roomRepository;
.filter(Predicate<Optional<User>> { it.isPresent() }) this.absoluteUrlHelper = absoluteUrlHelper;
.map<User>(Function<Optional<User>, User> { it.get() }) this.methodCallHelper = methodCallHelper;
.firstElement() this.connectivityManagerApi = connectivityManagerApi;
.toSingle() }
override fun bindView(view: RoomContract.View) { @Override
super.bindView(view) public void bindView(@NonNull RoomContract.View view) {
refreshRoom() super.bindView(view);
} refreshRoom();
}
override fun refreshRoom() {
getRoomRoles() @Override
getRoomInfo() public void refreshRoom() {
getRoomHistoryStateInfo() getRoomRoles();
getMessages() getRoomInfo();
getUserPreferences() getRoomHistoryStateInfo();
} getMessages();
getUserPreferences();
override fun loadMessages() { }
val subscription = singleRoom
.flatMap<Boolean>(Function<Room, SingleSource<out Boolean>> { messageInteractor.loadMessages(it) }) @Override
public void loadMessages() {
final Disposable subscription = getSingleRoom()
.flatMap(messageInteractor::loadMessages)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ success -> success -> {
if (!success) { if (!success) {
connectivityManagerApi.keepAliveServer() connectivityManagerApi.keepAliveServer();
} }
}, },
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
} }
override fun loadMoreMessages() { @Override
val subscription = singleRoom public void loadMoreMessages() {
.flatMap<Boolean>(Function<Room, SingleSource<out Boolean>> { messageInteractor.loadMoreMessages(it) }) final Disposable subscription = getSingleRoom()
.flatMap(messageInteractor::loadMoreMessages)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ success -> success -> {
if (!success) { if (!success) {
connectivityManagerApi.keepAliveServer() connectivityManagerApi.keepAliveServer();
} }
}, },
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
} }
override fun onMessageSelected(message: Message?) { @Override
public void onMessageSelected(@Nullable Message message) {
if (message == null) { if (message == null) {
return return;
} }
if (message.syncState == SyncState.DELETE_FAILED) { if (message.getSyncState() == SyncState.DELETE_FAILED) {
view.showMessageDeleteFailure(message) view.showMessageDeleteFailure(message);
} else if (message.syncState == SyncState.FAILED) { } else if (message.getSyncState() == SyncState.FAILED) {
view.showMessageSendFailure(message) view.showMessageSendFailure(message);
} else if (message.type == null && message.syncState == SyncState.SYNCED) { } else if (message.getType() == null && message.getSyncState() == SyncState.SYNCED) {
// If message is not a system message show applicable actions. // If message is not a system message show applicable actions.
view.showMessageActions(message) view.showMessageActions(message);
} }
} }
override fun onMessageTap(message: Message?) { @Override
public void onMessageTap(@Nullable Message message) {
if (message == null) { if (message == null) {
return return;
} }
if (message.syncState == SyncState.FAILED) { if (message.getSyncState() == SyncState.FAILED) {
view.showMessageSendFailure(message) view.showMessageSendFailure(message);
} }
} }
override fun replyMessage(message: Message, justQuote: Boolean) { @Override
val subscription = this.absoluteUrlHelper.rocketChatAbsoluteUrl public void replyMessage(@NonNull Message message, boolean justQuote) {
final Disposable subscription = this.absoluteUrlHelper.getRocketChatAbsoluteUrl()
.cache() .cache()
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ serverUrl -> serverUrl -> {
if (serverUrl.isPresent) { if (serverUrl.isPresent()) {
val absoluteUrl = serverUrl.get() RocketChatAbsoluteUrl absoluteUrl = serverUrl.get();
val baseUrl = absoluteUrl.baseUrl String baseUrl = absoluteUrl.getBaseUrl();
view.onReply(absoluteUrl, buildReplyOrQuoteMarkdown(baseUrl, message, justQuote), message) view.onReply(absoluteUrl, buildReplyOrQuoteMarkdown(baseUrl, message, justQuote), message);
} }
}, },
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
} }
override fun acceptMessageDeleteFailure(message: Message) { public void acceptMessageDeleteFailure(Message message) {
val subscription = messageInteractor.acceptDeleteFailure(message) final Disposable subscription = messageInteractor.acceptDeleteFailure(message)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe() .subscribe();
addSubscription(subscription) addSubscription(subscription);
} }
override fun loadMissedMessages() { @Override
val appContext = RocketChatApplication.getInstance() public void loadMissedMessages() {
val openedRooms = RocketChatCache(appContext).openedRooms RocketChatApplication appContext = RocketChatApplication.getInstance();
JSONObject openedRooms = new RocketChatCache(appContext).getOpenedRooms();
if (openedRooms.has(roomId)) { if (openedRooms.has(roomId)) {
try { try {
val room = openedRooms.getJSONObject(roomId) JSONObject room = openedRooms.getJSONObject(roomId);
val rid = room.optString("rid") String rid = room.optString("rid");
val ls = room.optLong("ls") long ls = room.optLong("ls");
methodCallHelper.loadMissedMessages(rid, ls) methodCallHelper.loadMissedMessages(rid, ls)
.continueWith(LogIfError()) .continueWith(new LogIfError());
} catch (e: JSONException) { } catch (JSONException e) {
RCLog.e(e) RCLog.e(e);
} }
} }
} }
private fun buildReplyOrQuoteMarkdown(baseUrl: String, message: Message, justQuote: Boolean): String { private String buildReplyOrQuoteMarkdown(String baseUrl, Message message, boolean justQuote) {
if (currentRoom == null || message.user == null) { if (currentRoom == null || message.getUser() == null) {
return "" return "";
} }
return if (currentRoom!!.isDirectMessage) { if (currentRoom.isDirectMessage()) {
String.format("[ ](%s/direct/%s?msg=%s) ", baseUrl, return String.format("[ ](%s/direct/%s?msg=%s) ", baseUrl,
message.user!!.username, message.getUser().getUsername(),
message.id) message.getId());
} else { } else {
String.format("[ ](%s/channel/%s?msg=%s) %s", baseUrl, return String.format("[ ](%s/channel/%s?msg=%s) %s", baseUrl,
currentRoom!!.name, currentRoom.getName(),
message.id, message.getId(),
if (justQuote) "" else "@" + message.user!!.username + " ") justQuote ? "" : "@" + message.getUser().getUsername() + " ");
} }
} }
override fun sendMessage(messageText: String) { @Override
view.disableMessageInput() public void sendMessage(String messageText) {
val subscription = roomUserPair view.disableMessageInput();
.flatMap { pair -> messageInteractor.send(pair.first!!, pair.second!!, messageText) } final Disposable subscription = getRoomUserPair()
.flatMap(pair -> messageInteractor.send(pair.first, pair.second, messageText))
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ success -> success -> {
if (success) { if (success) {
view.onMessageSendSuccessfully() view.onMessageSendSuccessfully();
} }
view.enableMessageInput() view.enableMessageInput();
} },
) { throwable -> throwable -> {
view.enableMessageInput() view.enableMessageInput();
Logger.report(throwable) Logger.INSTANCE.report(throwable);
} }
);
addSubscription(subscription) addSubscription(subscription);
} }
override fun resendMessage(message: Message) { @Override
val subscription = currentUser public void resendMessage(@NonNull Message message) {
.flatMap { user -> messageInteractor.resend(message, user) } final Disposable subscription = getCurrentUser()
.flatMap(user -> messageInteractor.resend(message, user))
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe() .subscribe();
addSubscription(subscription) addSubscription(subscription);
} }
override fun updateMessage(message: Message, content: String) { @Override
view.disableMessageInput() public void updateMessage(@NonNull Message message, String content) {
val subscription = currentUser view.disableMessageInput();
.flatMap { user -> messageInteractor.update(message, user, content) } final Disposable subscription = getCurrentUser()
.flatMap(user -> messageInteractor.update(message, user, content))
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ success -> success -> {
if (success) { if (success) {
view.onMessageSendSuccessfully() view.onMessageSendSuccessfully();
}
view.enableMessageInput()
} }
) { throwable -> view.enableMessageInput();
view.enableMessageInput() },
Logger.report(throwable) throwable -> {
view.enableMessageInput();
Logger.INSTANCE.report(throwable);
} }
);
addSubscription(subscription) addSubscription(subscription);
} }
override fun deleteMessage(message: Message) { @Override
val subscription = messageInteractor.delete(message) public void deleteMessage(@NonNull Message message) {
final Disposable subscription = messageInteractor.delete(message)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe() .subscribe();
addSubscription(subscription) addSubscription(subscription);
} }
override fun onUnreadCount() { @Override
val subscription = roomUserPair public void onUnreadCount() {
.flatMap { roomUserPair -> final Disposable subscription = getRoomUserPair()
messageInteractor .flatMap(roomUserPair -> messageInteractor
.unreadCountFor(roomUserPair.first!!, roomUserPair.second!!) .unreadCountFor(roomUserPair.first, roomUserPair.second))
}
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ count -> view.showUnreadCount(count) }, count -> view.showUnreadCount(count),
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
} }
override fun onMarkAsRead() { @Override
val subscription = roomRepository.getById(roomId) public void onMarkAsRead() {
.filter(Predicate<Optional<Room>> { it.isPresent() }) final Disposable subscription = roomRepository.getById(roomId)
.map<Room>(Function<Optional<Room>, Room> { it.get() }) .filter(Optional::isPresent)
.map(Optional::get)
.firstElement() .firstElement()
.filter(Predicate<Room> { it.isAlert() }) .filter(Room::isAlert)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ room -> room -> methodCallHelper.readMessages(room.getRoomId())
methodCallHelper.readMessages(room.roomId) .continueWith(new LogIfError()),
.continueWith(LogIfError()) Logger.INSTANCE::report
}, );
Consumer<Throwable> { Logger.report(it) }
)
addSubscription(subscription) addSubscription(subscription);
} }
private fun getRoomRoles() { private void getRoomRoles() {
methodCallHelper.getRoomRoles(roomId) methodCallHelper.getRoomRoles(roomId);
} }
private fun getRoomInfo() { private void getRoomInfo() {
val subscription = roomRepository.getById(roomId) final Disposable subscription = roomRepository.getById(roomId)
.distinctUntilChanged() .distinctUntilChanged()
.filter(Predicate<Optional<Room>> { it.isPresent() }) .filter(Optional::isPresent)
.map<Room>(Function<Optional<Room>, Room> { it.get() }) .map(Optional::get)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer<Room> { this.processRoom(it) }, Consumer<Throwable> { Logger.report(it) }) .subscribe(this::processRoom, Logger.INSTANCE::report);
addSubscription(subscription) addSubscription(subscription);
} }
private fun processRoom(room: Room) { private void processRoom(Room room) {
this.currentRoom = room this.currentRoom = room;
view.render(room) view.render(room);
if (room.isDirectMessage) { if (room.isDirectMessage()) {
getUserByUsername(room.name) getUserByUsername(room.getName());
} }
} }
private fun getUserByUsername(username: String) { private void getUserByUsername(String username) {
val disposable = userRepository.getByUsername(username) final Disposable disposable = userRepository.getByUsername(username)
.distinctUntilChanged() .distinctUntilChanged()
.filter(Predicate<Optional<User>> { it.isPresent() }) .filter(Optional::isPresent)
.map<User>(Function<Optional<User>, User> { it.get() }) .map(Optional::get)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer<User> { view.showUserStatus(it) }, Consumer<Throwable> { Logger.report(it) }) .subscribe(view::showUserStatus, Logger.INSTANCE::report);
addSubscription(disposable) addSubscription(disposable);
} }
private fun getRoomHistoryStateInfo() { private void getRoomHistoryStateInfo() {
val subscription = roomRepository.getHistoryStateByRoomId(roomId) final Disposable subscription = roomRepository.getHistoryStateByRoomId(roomId)
.distinctUntilChanged() .distinctUntilChanged()
.filter(Predicate<Optional<RoomHistoryState>> { it.isPresent() }) .filter(Optional::isPresent)
.map<RoomHistoryState>(Function<Optional<RoomHistoryState>, RoomHistoryState> { it.get() }) .map(Optional::get)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ roomHistoryState -> roomHistoryState -> {
val syncState = roomHistoryState.getSyncState() int syncState = roomHistoryState.getSyncState();
view.updateHistoryState( view.updateHistoryState(
!roomHistoryState.isComplete(), !roomHistoryState.isComplete(),
syncState == SyncState.SYNCED || syncState == SyncState.FAILED syncState == SyncState.SYNCED || syncState == SyncState.FAILED
) );
}, },
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
} }
private fun getMessages() { private void getMessages() {
val subscription = Flowable.zip<Optional<Room>, Optional<RocketChatAbsoluteUrl>, Pair<Optional<Room>, Optional<RocketChatAbsoluteUrl>>>(roomRepository.getById(roomId), final Disposable subscription = Flowable.zip(roomRepository.getById(roomId),
absoluteUrlHelper.rocketChatAbsoluteUrl.toFlowable().cache(), BiFunction<Optional<Room>, Optional<RocketChatAbsoluteUrl>, Pair<Optional<Room>, Optional<RocketChatAbsoluteUrl>>> { first, second -> Pair(first, second) }) absoluteUrlHelper.getRocketChatAbsoluteUrl().toFlowable().cache(), Pair::new)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.map<Optional<Room>> { pair -> .map(pair -> {
view.setupWith(pair.second!!.orNull()) view.setupWith(pair.second.orNull());
pair.first return pair.first;
} })
.filter(Predicate<Optional<Room>> { it.isPresent() }) .filter(Optional::isPresent)
.map<Room>(Function<Optional<Room>, Room> { it.get() }) .map(Optional::get)
.map { room -> .map(room -> {
RocketChatCache(RocketChatApplication.getInstance()) new RocketChatCache(RocketChatApplication.getInstance())
.addOpenedRoom(room.roomId, room.lastSeen) .addOpenedRoom(room.getRoomId(), room.getLastSeen());
room return room;
} })
.flatMap<List<Message>>(Function<Room, Publisher<out List<Message>>> { messageInteractor.getAllFrom(it) }) .flatMap(messageInteractor::getAllFrom)
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
Consumer<List<Message>> { view.showMessages(it) }, view::showMessages,
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
} }
private fun getUserPreferences() { private void getUserPreferences() {
val subscription = userRepository.getCurrent() final Disposable subscription = userRepository.getCurrent()
.filter(Predicate<Optional<User>> { it.isPresent() }) .filter(Optional::isPresent)
.map<User>(Function<Optional<User>, User> { it.get() }) .map(Optional::get)
.filter { user -> user.settings != null } .filter(user -> user.getSettings() != null)
.map<Settings>(Function<User, Settings> { it.getSettings() }) .map(User::getSettings)
.filter { settings -> settings.preferences != null } .filter(settings -> settings.getPreferences() != null)
.map<Preferences>(Function<Settings, Preferences> { it.getPreferences() }) .map(Settings::getPreferences)
.distinctUntilChanged() .distinctUntilChanged()
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ preferences -> preferences -> {
if (preferences.isAutoImageLoad()) { if (preferences.isAutoImageLoad()) {
view.autoloadImages() view.autoloadImages();
} else { } else {
view.manualLoadImages() view.manualLoadImages();
} }
}, },
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
} }
private fun getAbsoluteUrl() { private void getAbsoluteUrl() {
val subscription = absoluteUrlHelper.rocketChatAbsoluteUrl final Disposable subscription = absoluteUrlHelper.getRocketChatAbsoluteUrl()
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ it -> view.setupWith(it.orNull()) }, it -> view.setupWith(it.orNull()),
Consumer<Throwable> { Logger.report(it) } Logger.INSTANCE::report
) );
addSubscription(subscription) addSubscription(subscription);
}
private Single<Pair<Room, User>> getRoomUserPair() {
return Single.zip(
getSingleRoom(),
getCurrentUser(),
Pair::new
);
}
private Single<Room> getSingleRoom() {
return roomRepository.getById(roomId)
.filter(Optional::isPresent)
.map(Optional::get)
.firstElement()
.toSingle();
}
private Single<User> getCurrentUser() {
return userRepository.getCurrent()
.filter(Optional::isPresent)
.map(Optional::get)
.firstElement()
.toSingle();
} }
} }
app/src/main/java/chat/rocket/android/fragment/server_config/AbstractServerConfigFragment.java
View file @ cf18e7f8
...@@ -8,7 +8,7 @@ import chat.rocket.android.R; ...@@ -8,7 +8,7 @@ import chat.rocket.android.R;
import chat.rocket.android.fragment.AbstractFragment; import chat.rocket.android.fragment.AbstractFragment;
import chat.rocket.android.helper.TextUtils; import chat.rocket.android.helper.TextUtils;
abstract class AbstractServerConfigFragment extends AbstractFragment { public abstract class AbstractServerConfigFragment extends AbstractFragment {
public static final String KEY_HOSTNAME = "hostname"; public static final String KEY_HOSTNAME = "hostname";
protected String hostname; protected String hostname;
......
app/src/main/java/chat/rocket/android/fragment/server_config/LoginFragment.kt
View file @ cf18e7f8
...@@ -99,14 +99,14 @@ class LoginFragment : AbstractServerConfigFragment(), LoginContract.View { ...@@ -99,14 +99,14 @@ class LoginFragment : AbstractServerConfigFragment(), LoginContract.View {
showFragmentWithBackStack(fragment) showFragmentWithBackStack(fragment)
} }
} }
viewMap[info.serviceName]?.setVisibility(View.VISIBLE) viewMap[info.serviceName]?.visibility = View.VISIBLE
} }
} }
} }
for (info in OAuthProviderInfo.LIST) { for (info in OAuthProviderInfo.LIST) {
if (supportedMap[info.serviceName] == false) { if (supportedMap[info.serviceName] == false) {
viewMap[info.serviceName]?.setVisibility(View.GONE) viewMap[info.serviceName]?.visibility = View.GONE
} }
} }
} }
......
app/src/main/java/chat/rocket/android/fragment/server_config/LoginPresenter.kt
View file @ cf18e7f8
...@@ -3,10 +3,14 @@ package chat.rocket.android.fragment.server_config ...@@ -3,10 +3,14 @@ package chat.rocket.android.fragment.server_config
import bolts.Continuation import bolts.Continuation
import bolts.Task import bolts.Task
import chat.rocket.android.BackgroundLooper import chat.rocket.android.BackgroundLooper
import chat.rocket.android.LaunchUtil
import chat.rocket.android.RocketChatApplication
import chat.rocket.android.RocketChatCache
import chat.rocket.android.api.MethodCallHelper import chat.rocket.android.api.MethodCallHelper
import chat.rocket.android.api.TwoStepAuthException import chat.rocket.android.api.TwoStepAuthException
import chat.rocket.android.helper.Logger import chat.rocket.android.helper.Logger
import chat.rocket.android.helper.TextUtils import chat.rocket.android.helper.TextUtils
import chat.rocket.android.service.ConnectivityManager
import chat.rocket.android.shared.BasePresenter import chat.rocket.android.shared.BasePresenter
import chat.rocket.core.PublicSettingsConstants import chat.rocket.core.PublicSettingsConstants
import chat.rocket.core.models.PublicSetting import chat.rocket.core.models.PublicSetting
...@@ -26,6 +30,20 @@ class LoginPresenter(private val loginServiceConfigurationRepository: LoginServi ...@@ -26,6 +30,20 @@ class LoginPresenter(private val loginServiceConfigurationRepository: LoginServi
getLoginServices() getLoginServices()
} }
override fun release() {
val context = RocketChatApplication.getInstance()
val rocketChatCache = RocketChatCache(context)
val hostname = rocketChatCache.selectedServerHostname
hostname?.let {
ConnectivityManager.getInstance(context).removeServer(hostname)
rocketChatCache.clearSelectedHostnameReferences()
}
super.release()
LaunchUtil.showMainActivity(context)
}
override fun login(username: String, password: String) { override fun login(username: String, password: String) {
if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) { if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) {
return return
...@@ -50,7 +68,9 @@ class LoginPresenter(private val loginServiceConfigurationRepository: LoginServi ...@@ -50,7 +68,9 @@ class LoginPresenter(private val loginServiceConfigurationRepository: LoginServi
.subscribeOn(AndroidSchedulers.from(BackgroundLooper.get())) .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribeBy( .subscribeBy(
onNext = { loginServiceConfigurations -> view.showLoginServices(loginServiceConfigurations) }, onNext = { loginServiceConfigurations ->
view.showLoginServices(loginServiceConfigurations);
},
onError = { Logger.report(it) } onError = { Logger.report(it) }
) )
) )
......
app/src/main/java/chat/rocket/android/helper/Logger.kt
View file @ cf18e7f8
package chat.rocket.android.helper package chat.rocket.android.helper
import chat.rocket.android.BuildConfig
import com.crashlytics.android.Crashlytics import com.crashlytics.android.Crashlytics
import com.google.firebase.crash.FirebaseCrash import com.google.firebase.crash.FirebaseCrash
import chat.rocket.android.BuildConfig
object Logger { object Logger {
fun report(throwable: Throwable) { fun report(throwable: Throwable) {
......
app/src/main/java/chat/rocket/android/push/PushManager.kt
View file @ cf18e7f8
...@@ -22,7 +22,6 @@ import chat.rocket.android.BuildConfig ...@@ -22,7 +22,6 @@ import chat.rocket.android.BuildConfig
import chat.rocket.android.R import chat.rocket.android.R
import chat.rocket.android.RocketChatCache import chat.rocket.android.RocketChatCache
import chat.rocket.android.activity.MainActivity import chat.rocket.android.activity.MainActivity
import chat.rocket.android.extensions.printStackTraceOnDebug
import chat.rocket.android.helper.Logger import chat.rocket.android.helper.Logger
import chat.rocket.core.interactors.MessageInteractor import chat.rocket.core.interactors.MessageInteractor
import chat.rocket.core.models.Room import chat.rocket.core.models.Room
......
app/src/main/java/chat/rocket/android/service/RealmBasedConnectivityManager.java
View file @ cf18e7f8
...@@ -107,7 +107,7 @@ import io.reactivex.subjects.BehaviorSubject; ...@@ -107,7 +107,7 @@ import io.reactivex.subjects.BehaviorSubject;
public void removeServer(String hostname) { public void removeServer(String hostname) {
RealmBasedServerInfo.remove(hostname); RealmBasedServerInfo.remove(hostname);
if (serverConnectivityList.containsKey(hostname)) { if (serverConnectivityList.containsKey(hostname)) {
disconnectFromServerIfNeeded(hostname) disconnectFromServerIfNeeded(hostname, DDPClient.REASON_CLOSED_BY_USER)
.subscribe(_val -> { .subscribe(_val -> {
}, RCLog::e); }, RCLog::e);
} }
...@@ -207,7 +207,7 @@ import io.reactivex.subjects.BehaviorSubject; ...@@ -207,7 +207,7 @@ import io.reactivex.subjects.BehaviorSubject;
}); });
} }
private Single<Boolean> disconnectFromServerIfNeeded(String hostname) { private Single<Boolean> disconnectFromServerIfNeeded(String hostname, int reason) {
return Single.defer(() -> { return Single.defer(() -> {
final int connectivity = serverConnectivityList.get(hostname); final int connectivity = serverConnectivityList.get(hostname);
if (connectivity == ServerConnectivity.STATE_DISCONNECTED) { if (connectivity == ServerConnectivity.STATE_DISCONNECTED) {
...@@ -216,8 +216,8 @@ import io.reactivex.subjects.BehaviorSubject; ...@@ -216,8 +216,8 @@ import io.reactivex.subjects.BehaviorSubject;
if (connectivity == ServerConnectivity.STATE_CONNECTING) { if (connectivity == ServerConnectivity.STATE_CONNECTING) {
return waitForConnected(hostname) return waitForConnected(hostname)
.doOnError(err -> notifyConnectionLost(hostname, DDPClient.REASON_NETWORK_ERROR)) // .doOnError(err -> notifyConnectionLost(hostname, DDPClient.REASON_CLOSED_BY_USER))
.flatMap(_val -> disconnectFromServerIfNeeded(hostname)); .flatMap(_val -> disconnectFromServerIfNeeded(hostname, DDPClient.REASON_CLOSED_BY_USER));
} }
if (connectivity == ServerConnectivity.STATE_DISCONNECTING) { if (connectivity == ServerConnectivity.STATE_DISCONNECTING) {
......
app/src/main/res/layout/fragment_login.xml
View file @ cf18e7f8
...@@ -11,84 +11,84 @@ ...@@ -11,84 +11,84 @@
<ScrollView <ScrollView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/container" android:id="@+id/container"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="280dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/margin_16" android:background="@drawable/container_bg"
android:paddingLeft="@dimen/margin_16" android:minWidth="280dp"
android:paddingBottom="@dimen/margin_8"
android:paddingEnd="@dimen/margin_16" android:paddingEnd="@dimen/margin_16"
android:paddingLeft="@dimen/margin_16"
android:paddingRight="@dimen/margin_16" android:paddingRight="@dimen/margin_16"
android:paddingStart="@dimen/margin_16"
android:paddingTop="@dimen/margin_8" android:paddingTop="@dimen/margin_8"
android:paddingBottom="@dimen/margin_8"
android:background="@drawable/container_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageButton <ImageButton
android:id="@+id/btn_login_with_twitter" android:id="@+id/btn_login_with_twitter"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitXY" android:scaleType="fitXY"
app:srcCompat="@drawable/ic_button_twitter_24dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/text_input_username" app:layout_constraintBottom_toTopOf="@+id/text_input_username"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/btn_login_with_facebook" app:layout_constraintRight_toLeftOf="@+id/btn_login_with_facebook"
android:background="?attr/selectableItemBackgroundBorderless" /> app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_button_twitter_24dp" />
<ImageButton <ImageButton
android:id="@+id/btn_login_with_facebook" android:id="@+id/btn_login_with_facebook"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitXY" android:scaleType="fitXY"
app:srcCompat="@drawable/ic_button_facebook_24dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/text_input_username" app:layout_constraintBottom_toTopOf="@+id/text_input_username"
app:layout_constraintLeft_toRightOf="@+id/btn_login_with_twitter" app:layout_constraintLeft_toRightOf="@+id/btn_login_with_twitter"
app:layout_constraintRight_toLeftOf="@+id/btn_login_with_github" app:layout_constraintRight_toLeftOf="@+id/btn_login_with_github"
android:background="?attr/selectableItemBackgroundBorderless" /> app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_button_facebook_24dp" />
<ImageButton <ImageButton
android:id="@+id/btn_login_with_github" android:id="@+id/btn_login_with_github"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitXY" android:scaleType="fitXY"
app:srcCompat="@drawable/ic_button_github_24dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/text_input_username" app:layout_constraintBottom_toTopOf="@+id/text_input_username"
app:layout_constraintLeft_toRightOf="@+id/btn_login_with_facebook" app:layout_constraintLeft_toRightOf="@+id/btn_login_with_facebook"
app:layout_constraintRight_toLeftOf="@+id/btn_login_with_google" app:layout_constraintRight_toLeftOf="@+id/btn_login_with_google"
android:background="?attr/selectableItemBackgroundBorderless" /> app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_button_github_24dp" />
<ImageButton <ImageButton
android:id="@+id/btn_login_with_google" android:id="@+id/btn_login_with_google"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitXY" android:scaleType="fitXY"
app:srcCompat="@drawable/ic_button_google_24dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/text_input_username" app:layout_constraintBottom_toTopOf="@+id/text_input_username"
app:layout_constraintLeft_toRightOf="@+id/btn_login_with_github" app:layout_constraintLeft_toRightOf="@+id/btn_login_with_github"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
android:background="?attr/selectableItemBackgroundBorderless" /> app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_button_google_24dp" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/text_input_username" android:id="@+id/text_input_username"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/btn_login_with_twitter"
app:layout_constraintBottom_toTopOf="@+id/text_input_passwd" app:layout_constraintBottom_toTopOf="@+id/text_input_passwd"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_login_with_twitter">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/editor_username" android:id="@+id/editor_username"
...@@ -104,10 +104,10 @@ ...@@ -104,10 +104,10 @@
android:id="@+id/text_input_passwd" android:id="@+id/text_input_passwd"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/text_input_username"
app:layout_constraintBottom_toTopOf="@+id/btn_user_registration" app:layout_constraintBottom_toTopOf="@+id/btn_user_registration"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_input_username">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/editor_passwd" android:id="@+id/editor_passwd"
...@@ -121,27 +121,27 @@ ...@@ -121,27 +121,27 @@
<Button <Button
android:id="@+id/btn_user_registration" android:id="@+id/btn_user_registration"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_8" android:layout_marginTop="@dimen/margin_8"
android:text="@string/fragment_login_sign_up" android:text="@string/fragment_login_sign_up"
app:layout_constraintTop_toBottomOf="@+id/text_input_passwd"
app:layout_constraintRight_toLeftOf="@+id/btn_login_with_email"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
style="@style/Widget.AppCompat.Button.Colored" /> app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/btn_login_with_email"
app:layout_constraintTop_toBottomOf="@+id/text_input_passwd" />
<Button <Button
android:id="@+id/btn_login_with_email" android:id="@+id/btn_login_with_email"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_8" android:layout_marginTop="@dimen/margin_8"
android:text="@string/fragment_login_sign_in" android:text="@string/fragment_login_sign_in"
app:layout_constraintTop_toBottomOf="@+id/text_input_passwd"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toRightOf="@+id/btn_user_registration"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
style="@style/Widget.AppCompat.Button.Colored" /> app:layout_constraintLeft_toRightOf="@+id/btn_user_registration"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_input_passwd" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</ScrollView> </ScrollView>
......
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

Technounit-GROUP 2023