Add IDENTIFIER constant.
This commit is contained in:
parent
653f1e1bcc
commit
47c44233fa
|
@ -1,6 +1,7 @@
|
|||
// This file hosts the contansts with the values used on native apps (User Defaults on iOS and Shared Preferences on Android).
|
||||
import { isIOS } from '../utils/deviceInfo';
|
||||
|
||||
export const IDENTIFIER = isIOS ? 'group.ios.chat.rocket' : 'chat.rocket.android';
|
||||
export const SERVERS = isIOS ? 'kServers' : 'ACCOUNTS_KEY';
|
||||
export const TOKEN = isIOS ? 'kAuthToken' : 'authToken';
|
||||
export const USER_ID = isIOS ? 'kUserId' : 'userId';
|
||||
|
|
|
@ -14,13 +14,12 @@ import log from '../utils/log';
|
|||
import Navigation from '../lib/Navigation';
|
||||
import database from '../lib/realm';
|
||||
import {
|
||||
SERVERS, SERVER_ICON, SERVER_NAME, SERVER_URL, TOKEN, USER_ID
|
||||
IDENTIFIER, SERVERS, SERVER_ICON, SERVER_NAME, SERVER_URL, TOKEN, USER_ID
|
||||
} from '../constants/credentials';
|
||||
import { isIOS } from '../utils/deviceInfo';
|
||||
|
||||
const restore = function* restore() {
|
||||
try {
|
||||
yield RNUserDefaults.setName(isIOS ? 'group.ios.chat.rocket' : 'chat.rocket.android');
|
||||
yield RNUserDefaults.setName(IDENTIFIER);
|
||||
const hasMigration = yield AsyncStorage.getItem('hasMigration');
|
||||
|
||||
let { token, server } = yield all({
|
||||
|
|
|
@ -7,10 +7,12 @@ import RNUserDefaults from 'rn-user-defaults';
|
|||
import Navigation from './lib/ShareNavigation';
|
||||
import store from './lib/createStore';
|
||||
import sharedStyles from './views/Styles';
|
||||
import { isNotch, isIOS } from './utils/deviceInfo';
|
||||
import { isNotch } from './utils/deviceInfo';
|
||||
import { defaultHeader, onNavigationStateChange } from './utils/navigation';
|
||||
import RocketChat from './lib/rocketchat';
|
||||
|
||||
import { IDENTIFIER } from './constants/credentials';
|
||||
|
||||
const InsideNavigator = createStackNavigator({
|
||||
ShareListView: {
|
||||
getScreen: () => require('./views/ShareListView').default
|
||||
|
@ -56,9 +58,7 @@ class Root extends React.Component {
|
|||
}
|
||||
|
||||
init = async() => {
|
||||
if (isIOS) {
|
||||
await RNUserDefaults.setName('group.ios.chat.rocket');
|
||||
}
|
||||
await RNUserDefaults.setName(IDENTIFIER);
|
||||
const currentServer = await RNUserDefaults.get('currentServer');
|
||||
const token = await RNUserDefaults.get(RocketChat.TOKEN_KEY);
|
||||
|
||||
|
|
Loading…
Reference in New Issue