verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add IDENTIFIER constant.

This commit is contained in:
Filipe Brito 2019-08-29 17:29:06 -03:00
parent 653f1e1bcc
commit 47c44233fa
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/constants/credentials.js
View File

@ -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). // 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'; 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 SERVERS = isIOS ? 'kServers' : 'ACCOUNTS_KEY';
export const TOKEN = isIOS ? 'kAuthToken' : 'authToken'; export const TOKEN = isIOS ? 'kAuthToken' : 'authToken';
export const USER_ID = isIOS ? 'kUserId' : 'userId'; export const USER_ID = isIOS ? 'kUserId' : 'userId';

5
app/sagas/init.js
View File

@ -14,13 +14,12 @@ import log from '../utils/log';
import Navigation from '../lib/Navigation'; import Navigation from '../lib/Navigation';
import database from '../lib/realm'; import database from '../lib/realm';
import { 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'; } from '../constants/credentials';
import { isIOS } from '../utils/deviceInfo';
const restore = function* restore() { const restore = function* restore() {
try { try {
yield RNUserDefaults.setName(isIOS ? 'group.ios.chat.rocket' : 'chat.rocket.android'); yield RNUserDefaults.setName(IDENTIFIER);
const hasMigration = yield AsyncStorage.getItem('hasMigration'); const hasMigration = yield AsyncStorage.getItem('hasMigration');
let { token, server } = yield all({ let { token, server } = yield all({

8
app/share.js
View File

@ -7,10 +7,12 @@ import RNUserDefaults from 'rn-user-defaults';
import Navigation from './lib/ShareNavigation'; import Navigation from './lib/ShareNavigation';
import store from './lib/createStore'; import store from './lib/createStore';
import sharedStyles from './views/Styles'; import sharedStyles from './views/Styles';
import { isNotch, isIOS } from './utils/deviceInfo'; import { isNotch } from './utils/deviceInfo';
import { defaultHeader, onNavigationStateChange } from './utils/navigation'; import { defaultHeader, onNavigationStateChange } from './utils/navigation';
import RocketChat from './lib/rocketchat'; import RocketChat from './lib/rocketchat';
import { IDENTIFIER } from './constants/credentials';
const InsideNavigator = createStackNavigator({ const InsideNavigator = createStackNavigator({
ShareListView: { ShareListView: {
getScreen: () => require('./views/ShareListView').default getScreen: () => require('./views/ShareListView').default
@ -56,9 +58,7 @@ class Root extends React.Component {
} }
init = async() => { init = async() => {
if (isIOS) { await RNUserDefaults.setName(IDENTIFIER);
await RNUserDefaults.setName('group.ios.chat.rocket');
}
const currentServer = await RNUserDefaults.get('currentServer'); const currentServer = await RNUserDefaults.get('currentServer');
const token = await RNUserDefaults.get(RocketChat.TOKEN_KEY); const token = await RNUserDefaults.get(RocketChat.TOKEN_KEY);