verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Remove initial screen to select RocketChat server

This commit is contained in:
Timothy Roy 2024-03-05 14:58:39 -06:00
parent 4c8caf0bfd
commit bbfd7e91a2
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/sagas/init.js
View File

@ -4,7 +4,7 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
import { BIOMETRY_ENABLED_KEY, CURRENT_SERVER, TOKEN_KEY } from '../lib/constants'; import { BIOMETRY_ENABLED_KEY, CURRENT_SERVER, TOKEN_KEY } from '../lib/constants';
import UserPreferences from '../lib/methods/userPreferences'; import UserPreferences from '../lib/methods/userPreferences';
import { selectServerRequest } from '../actions/server'; import { selectServerRequest, serverRequest } from '../actions/server';
import { setAllPreferences } from '../actions/sortPreferences'; import { setAllPreferences } from '../actions/sortPreferences';
import { APP } from '../actions/actionsTypes'; import { APP } from '../actions/actionsTypes';
import log from '../lib/methods/helpers/log'; import log from '../lib/methods/helpers/log';
@ -15,6 +15,10 @@ import { RootEnum } from '../definitions';
import { getSortPreferences } from '../lib/methods'; import { getSortPreferences } from '../lib/methods';
import { deepLinkingClickCallPush } from '../actions/deepLinking'; import { deepLinkingClickCallPush } from '../actions/deepLinking';
import appConfig from '../../app.json';
import SERVER_URL from './serverConfig';
export const initLocalSettings = function* initLocalSettings() { export const initLocalSettings = function* initLocalSettings() {
const sortPreferences = getSortPreferences(); const sortPreferences = getSortPreferences();
yield put(setAllPreferences(sortPreferences)); yield put(setAllPreferences(sortPreferences));
@ -24,8 +28,8 @@ const BIOMETRY_MIGRATION_KEY = 'kBiometryMigration';
const restore = function* restore() { const restore = function* restore() {
try { try {
const server = UserPreferences.getString(CURRENT_SERVER); const { server } = appConfig;
let userId = UserPreferences.getString(`${TOKEN_KEY}-${server}`); const userId = UserPreferences.getString(`${TOKEN_KEY}-${server}`);
// Migration biometry setting from WatermelonDB to MMKV // Migration biometry setting from WatermelonDB to MMKV
// TODO: remove it after a few versions // TODO: remove it after a few versions
@ -39,23 +43,12 @@ const restore = function* restore() {
UserPreferences.setBool(BIOMETRY_MIGRATION_KEY, true); UserPreferences.setBool(BIOMETRY_MIGRATION_KEY, true);
} }
if (!server) { if (!userId) {
yield put(appStart({ root: RootEnum.ROOT_OUTSIDE }));
} else if (!userId) {
const serversDB = database.servers; const serversDB = database.servers;
const serversCollection = serversDB.get('servers'); const serversCollection = serversDB.get('servers');
const servers = yield serversCollection.query().fetch(); const servers = yield serversCollection.query().fetch();
// Check if there're other logged in servers and picks first one yield put(serverRequest(SERVER_URL));
if (servers.length > 0) {
for (let i = 0; i < servers.length; i += 1) {
const newServer = servers[i].id;
userId = UserPreferences.getString(`${TOKEN_KEY}-${newServer}`);
if (userId) {
return yield put(selectServerRequest(newServer));
}
}
}
yield put(appStart({ root: RootEnum.ROOT_OUTSIDE })); yield put(appStart({ root: RootEnum.ROOT_OUTSIDE }));
} else { } else {
const serversDB = database.servers; const serversDB = database.servers;