Changes to logic

Author: Rohit3523

app/sagas/login.js

@@ -32,7 +32,7 @@ import { getUserPresence, subscribeUsersPresence } from '../lib/methods/getUsers
 import { logout, removeServerData, removeServerDatabase } from '../lib/methods/logout';
 import { subscribeSettings } from '../lib/methods/getSettings';
 import { connect, loginWithPassword, login } from '../lib/services/connect';
-import { saveUserProfile, registerPushToken, getUsersRoles } from '../lib/services/restApi';
+import { saveUserProfile, registerPushToken, getUsersRoles, setUserPresenceAway } from '../lib/services/restApi';
 import { setUsersRoles } from '../actions/usersRoles';
 import { getServerById } from '../lib/database/services/Server';
 import appNavigation from '../lib/navigation/appNavigation';
@@ -223,6 +223,17 @@ const fetchUsersRoles = function* fetchRoomsFork() {
 	}
 };
 
+const checkBackgroundAndSetAway = function* checkBackgroundAndSetAway() {
+	try {
+		const isBackground = yield select(state => state.app.background);
+		if (isBackground) {
+			yield setUserPresenceAway();
+		}
+	} catch (e) {
+		log(e);
+	}
+};
+
 const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 	try {
 		getUserPresence(user.id);
@@ -239,6 +250,7 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 		yield fork(fetchEnterpriseModulesFork, { user });
 		yield fork(subscribeSettingsFork);
 		yield fork(fetchUsersRoles);
+		yield fork(checkBackgroundAndSetAway);
 
 		setLanguage(user?.language);
 

app/sagas/state.js

@@ -1,6 +1,5 @@
 import { select, takeLatest } from 'redux-saga/effects';
 
-import Navigation from '../lib/navigation/appNavigation';
 import log from '../lib/methods/helpers/log';
 import { localAuthenticate, saveLastLocalAuthenticationSession } from '../lib/methods/helpers/localAuthentication';
 import { APP_STATE } from '../actions/actionsTypes';
@@ -9,25 +8,24 @@ import { checkAndReopen } from '../lib/services/connect';
 import { setUserPresenceOnline, setUserPresenceAway } from '../lib/services/restApi';
 import { checkPendingNotification } from '../lib/notifications';
 
+const isAuthAndConnected = function* isAuthAndConnected() {
+	const login = yield select(state => state.login);
+	const meteor = yield select(state => state.meteor);
+	return login.isAuthenticated && meteor.connected;
+};
+
 const appHasComeBackToForeground = function* appHasComeBackToForeground() {
 	const appRoot = yield select(state => state.app.root);
-	if (appRoot === RootEnum.ROOT_OUTSIDE) {
+	if (appRoot !== RootEnum.ROOT_INSIDE) {
 		return;
 	}
-	const login = yield select(state => state.login);
-	const server = yield select(state => state.server);
-	if (
-		!login.isAuthenticated ||
-		login.isFetching ||
-		server.connecting ||
-		server.loading ||
-		server.changingServer ||
-		!Navigation.navigationRef.current
-	) {
+	const isReady = yield isAuthAndConnected();
+	if (!isReady) {
 		return;
 	}
 	try {
-		yield localAuthenticate(server.server);
+		const server = yield select(state => state.server.server);
+		yield localAuthenticate(server);
 		checkAndReopen();
 		// Check for pending notification when app comes to foreground (Android - notification tap while in background)
 		checkPendingNotification().catch((e) => {
@@ -41,13 +39,16 @@ const appHasComeBackToForeground = function* appHasComeBackToForeground() {
 
 const appHasComeBackToBackground = function* appHasComeBackToBackground() {
 	const appRoot = yield select(state => state.app.root);
-	if (appRoot === RootEnum.ROOT_OUTSIDE) {
+	if (appRoot !== RootEnum.ROOT_INSIDE) {
+		return;
+	}
+	const isReady = yield isAuthAndConnected();
+	if (!isReady) {
 		return;
 	}
 	try {
 		const server = yield select(state => state.server.server);
 		yield saveLastLocalAuthenticationSession(server);
-
 		yield setUserPresenceAway();
 	} catch (e) {
 		log(e);