minor updates and fixes

android/app/src/official/google-services.json

@@ -228,4 +228,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

android/app/src/official/res/values-night/colors.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<item name="splashBackground" type="color">#000000</item>
-</resources>
+</resources>

android/app/src/official/res/values/colors.xml

@@ -3,4 +3,4 @@
 	<color name="primary_dark">#660B0B0B</color>
 	<item name="splashBackground" type="color">#eeeff1</item>
 	<item name="notification_text" type="color">#CC3333</item>
-</resources>
+</resources>

android/app/src/official/res/xml/network_security_config.xml

@@ -6,4 +6,4 @@
             <certificates src="user" />
         </trust-anchors>
     </base-config>
-</network-security-config>
+</network-security-config>

android/gradle.properties

@@ -34,4 +34,4 @@ VERSIONCODE=999999999
 BugsnagAPIKey=""
 
 OFFICIAL_VERSIONCODE=1
-OFFICIAL_BugsnagAPIKey="0e62781637138bc11e6ad3ca14c03899"
+OFFICIAL_BugsnagAPIKey="0e62781637138bc11e6ad3ca14c03899"

app/constants/credentials.js

@@ -8,4 +8,4 @@ export const USER_ID = isIOS ? 'kUserId' : 'userId';
 export const SERVER_URL = isIOS ? 'kAuthServerURL' : 'serverUrl';
 export const SERVER_NAME = isIOS ? 'kServerName' : 'serverName';
 export const SERVER_ICON = isIOS ? 'kServerIconURL' : 'serverLogoUrl';
-export const ANDROID_PACKAGE_CONTEXT = 'chat.rocket.android';
+export const ANDROID_PACKAGE_CONTEXT = 'chat.rocket.android';

app/sagas/init.js

@@ -29,11 +29,11 @@ export const initLocalSettings = function* initLocalSettings() {
 };
 
 const restore = function* restore() {
+	let hasMigration;
 	try {
 		if (isOfficialBuild) {
-			const hasMigration = yield AsyncStorage.getItem('hasMigration');
+			hasMigration = yield AsyncStorage.getItem('hasMigration');
 		} else {
-			let hasMigration;
 			if (isIOS) {
 				hasMigration = yield AsyncStorage.getItem('hasMigration');
 			}