Merge 4.14.0 into single-server

android/app/build.gradle

@@ -144,7 +144,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.13.1"
+        versionName "4.14.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

android/app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:exported="true"
             android:label="@string/app_name"
-            android:launchMode="singleTask"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />

android/app/src/main/java/chat/rocket/reactnative/MainActivity.java

@@ -14,7 +14,6 @@
 
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 import com.zoontek.rnbootsplash.RNBootSplash;
-import com.tencent.mmkv.MMKV;
 import com.google.gson.Gson;
 
 class ThemePreferences {
@@ -36,61 +35,11 @@ protected void onCreate(Bundle savedInstanceState) {
         // https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067
         super.onCreate(null);
         RNBootSplash.init(R.drawable.launch_screen, MainActivity.this);
+    }
 
-        MMKV.initialize(MainActivity.this);
-
-        // Start the MMKV container
-        MMKV defaultMMKV = MMKV.defaultMMKV();
-        boolean alreadyMigrated = defaultMMKV.decodeBool("alreadyMigrated");
-
-        if (!alreadyMigrated) {
-            // MMKV Instance that will be used by JS
-            MMKV mmkv = MMKV.mmkvWithID("default");
-
-            // SharedPreferences -> MMKV (Migration)
-            SharedPreferences sharedPreferences = getSharedPreferences("react-native", Context.MODE_PRIVATE);
-            mmkv.importFromSharedPreferences(sharedPreferences);
-
-            // SharedPreferences only save strings, so we saved this value as a String and now we'll need to cast into a MMKV object
-
-            // Theme preferences object
-            String THEME_PREFERENCES_KEY = "RC_THEME_PREFERENCES_KEY";
-            String themeJson = sharedPreferences.getString(THEME_PREFERENCES_KEY, "");
-            if (!themeJson.isEmpty()) {
-              ThemePreferences themePreferences = new Gson().fromJson(themeJson, ThemePreferences.class);
-              WritableMap themeMap = new Arguments().createMap();
-              themeMap.putString("currentTheme", themePreferences.currentTheme);
-              themeMap.putString("darkLevel", themePreferences.darkLevel);
-              Bundle bundle = Arguments.toBundle(themeMap);
-              mmkv.encode(THEME_PREFERENCES_KEY, bundle);
-            }
-
-            // Sort preferences object
-            String SORT_PREFS_KEY = "RC_SORT_PREFS_KEY";
-            String sortJson = sharedPreferences.getString(SORT_PREFS_KEY, "");
-            if (!sortJson.isEmpty()) {
-              SortPreferences sortPreferences = new Gson().fromJson(sortJson, SortPreferences.class);
-              WritableMap sortMap = new Arguments().createMap();
-              sortMap.putString("sortBy", sortPreferences.sortBy);
-              if (sortPreferences.groupByType != null) {
-                sortMap.putBoolean("groupByType", sortPreferences.groupByType);
-              }
-              if (sortPreferences.showFavorites != null) {
-                sortMap.putBoolean("showFavorites", sortPreferences.showFavorites);
-              }
-              if (sortPreferences.showUnread != null) {
-                sortMap.putBoolean("showUnread", sortPreferences.showUnread);
-              }
-              Bundle bundle = Arguments.toBundle(sortMap);
-              mmkv.encode(SORT_PREFS_KEY, bundle);
-            }
-
-            // Remove all our keys of SharedPreferences
-            sharedPreferences.edit().clear().commit();
-
-            // Mark migration complete
-            defaultMMKV.encode("alreadyMigrated", true);
-        }
+    @Override
+    public void invokeDefaultOnBackPressed() {
+        moveTaskToBack(true);
     }
 
     /**

android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java

@@ -257,7 +257,6 @@ private void notificationStyle(Notification.Builder notification, int notId, Bun
             Notification.MessagingStyle messageStyle;
 
             Gson gson = new Gson();
-            Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class);
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
                 messageStyle = new Notification.MessagingStyle("");
@@ -278,25 +277,19 @@ private void notificationStyle(Notification.Builder notification, int notId, Bun
 
                     long timestamp = data.getLong("time");
                     String message = data.getString("message");
-                    String username = data.getString("username");
                     String senderId = data.getString("senderId");
                     String avatarUri = data.getString("avatarUri");
-
+                    Ejson ejson = gson.fromJson(data.getString("ejson", "{}"), Ejson.class);
                     String m = extractMessage(message, ejson);
 
                     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                        messageStyle.addMessage(m, timestamp, username);
+                        messageStyle.addMessage(m, timestamp, ejson.senderName);
                     } else {
                         Bitmap avatar = getAvatar(avatarUri);
 
-                        String name = username;
-                        if (ejson.senderName != null) {
-                            name = ejson.senderName;
-                        }
-
                         Person.Builder sender = new Person.Builder()
                                 .setKey(senderId)
-                                .setName(name);
+                                .setName(ejson.senderName);
 
                         if (avatar != null) {
                             sender.setIcon(Icon.createWithBitmap(avatar));

app/AppContainer.js

@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 import Navigation from './lib/Navigation';
 import { defaultHeader, getActiveRouteName, navigationTheme } from './utils/navigation';
 import {
-	ROOT_LOADING, ROOT_OUTSIDE, ROOT_NEW_SERVER, ROOT_INSIDE, ROOT_SET_USERNAME, ROOT_BACKGROUND
+	ROOT_LOADING, ROOT_OUTSIDE, ROOT_NEW_SERVER, ROOT_INSIDE, ROOT_SET_USERNAME
 } from './actions/app';
 
 // Stacks
@@ -65,7 +65,7 @@ const App = React.memo(({ root, isMasterDetail }) => {
 		>
 			<Stack.Navigator screenOptions={{ headerShown: false, animationEnabled: false }}>
 				<>
-					{root === ROOT_LOADING || root === ROOT_BACKGROUND ? (
+					{root === ROOT_LOADING ? (
 						<Stack.Screen
 							name='AuthLoading'
 							component={AuthLoadingView}

app/actions/actionsTypes.js

@@ -69,4 +69,4 @@ export const INVITE_LINKS = createRequestTypes('INVITE_LINKS', [
 export const SETTINGS = createRequestTypes('SETTINGS', ['CLEAR', 'ADD']);
 export const APP_STATE = createRequestTypes('APP_STATE', ['FOREGROUND', 'BACKGROUND']);
 export const ENTERPRISE_MODULES = createRequestTypes('ENTERPRISE_MODULES', ['CLEAR', 'SET']);
-export const ENCRYPTION = createRequestTypes('ENCRYPTION', ['INIT', 'STOP', 'DECODE_KEY', 'SET_BANNER']);
+export const ENCRYPTION = createRequestTypes('ENCRYPTION', ['INIT', 'STOP', 'DECODE_KEY', 'SET', 'SET_BANNER']);

app/actions/app.js

@@ -5,7 +5,6 @@ export const ROOT_INSIDE = 'inside';
 export const ROOT_LOADING = 'loading';
 export const ROOT_NEW_SERVER = 'newServer';
 export const ROOT_SET_USERNAME = 'setUsername';
-export const ROOT_BACKGROUND = 'background';
 
 export function appStart({ root, ...args }) {
 	return {

app/actions/encryption.js

@@ -12,6 +12,14 @@ export function encryptionStop() {
 	};
 }
 
+export function encryptionSet(enabled = false, banner = null) {
+	return {
+		type: types.ENCRYPTION.SET,
+		enabled,
+		banner
+	};
+}
+
 export function encryptionSetBanner(banner) {
 	return {
 		type: types.ENCRYPTION.SET_BANNER,

app/actions/server.js

@@ -1,11 +1,12 @@
 import { SERVER } from './actionsTypes';
 
-export function selectServerRequest(server, version, fetchVersion = true) {
+export function selectServerRequest(server, version, fetchVersion = true, changeServer = false) {
 	return {
 		type: SERVER.SELECT_REQUEST,
 		server,
 		version,
-		fetchVersion
+		fetchVersion,
+		changeServer
 	};
 }
 

app/constants/colors.js

@@ -35,6 +35,7 @@ export const themes = {
 		auxiliaryText: '#9ca2a8',
 		infoText: '#6d6d72',
 		tintColor: '#1d74f5',
+		tintActive: '#549df9',
 		auxiliaryTintColor: '#6C727A',
 		actionTintColor: '#1d74f5',
 		separatorColor: '#cbcbcc',
@@ -80,6 +81,7 @@ export const themes = {
 		auxiliaryText: '#9297a2',
 		infoText: '#6D6D72',
 		tintColor: '#1d74f5',
+		tintActive: '#549df9',
 		auxiliaryTintColor: '#f9f9f9',
 		actionTintColor: '#1d74f5',
 		separatorColor: '#2b2b2d',
@@ -125,6 +127,7 @@ export const themes = {
 		auxiliaryText: '#b2b8c6',
 		infoText: '#6d6d72',
 		tintColor: '#1e9bfe',
+		tintActive: '#76b7fc',
 		auxiliaryTintColor: '#f9f9f9',
 		actionTintColor: '#1e9bfe',
 		separatorColor: '#272728',

app/containers/List/ListItem.js

@@ -1,9 +1,6 @@
 import React from 'react';
 import {
-	View,
-	Text,
-	StyleSheet,
-	I18nManager
+	View, Text, StyleSheet, I18nManager
 } from 'react-native';
 import PropTypes from 'prop-types';
 
@@ -82,11 +79,12 @@ const Content = React.memo(({
 ));
 
 const Button = React.memo(({
-	onPress, ...props
+	onPress, backgroundColor, underlayColor, ...props
 }) => (
 	<Touch
 		onPress={() => onPress(props.title)}
-		style={{ backgroundColor: themes[props.theme].backgroundColor }}
+		style={{ backgroundColor: backgroundColor || themes[props.theme].backgroundColor }}
+		underlayColor={underlayColor}
 		enabled={!props.disabled}
 		theme={props.theme}
 	>
@@ -99,15 +97,16 @@ const ListItem = React.memo(({ ...props }) => {
 		return <Button {...props} />;
 	}
 	return (
-		<View style={{ backgroundColor: themes[props.theme].backgroundColor }}>
+		<View style={{ backgroundColor: props.backgroundColor || themes[props.theme].backgroundColor }}>
 			<Content {...props} />
 		</View>
 	);
 });
 
 ListItem.propTypes = {
 	onPress: PropTypes.func,
-	theme: PropTypes.string
+	theme: PropTypes.string,
+	backgroundColor: PropTypes.string
 };
 
 ListItem.displayName = 'List.Item';
@@ -137,7 +136,9 @@ Button.propTypes = {
 	title: PropTypes.string,
 	onPress: PropTypes.func,
 	disabled: PropTypes.bool,
-	theme: PropTypes.string
+	theme: PropTypes.string,
+	backgroundColor: PropTypes.string,
+	underlayColor: PropTypes.string
 };
 
 Button.defaultProps = {

app/containers/MessageBox/index.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import {
-	View, Alert, Keyboard, NativeModules, Text, InteractionManager
+	View, Alert, Keyboard, NativeModules, Text
 } from 'react-native';
 import { connect } from 'react-redux';
 import { KeyboardAccessoryView } from 'react-native-ui-lib/keyboard';
@@ -224,12 +224,12 @@ class MessageBox extends Component {
 		this.unsubscribeFocus = navigation.addListener('focus', () => {
 			// didFocus
 			// We should wait pushed views be dismissed
-			InteractionManager.runAfterInteractions(() => {
+			this.trackingTimeout = setTimeout(() => {
 				if (this.tracking && this.tracking.resetTracking) {
 					// Reset messageBox keyboard tracking
 					this.tracking.resetTracking();
 				}
-			});
+			}, 500);
 		});
 		this.unsubscribeBlur = navigation.addListener('blur', () => {
 			this.component?.blur();
@@ -258,6 +258,10 @@ class MessageBox extends Component {
 		} else if (!nextProps.message) {
 			this.clearInput();
 		}
+		if (this.trackingTimeout) {
+			clearTimeout(this.trackingTimeout);
+			this.trackingTimeout = false;
+		}
 	}
 
 	shouldComponentUpdate(nextProps, nextState) {
@@ -932,7 +936,7 @@ class MessageBox extends Component {
 				/>
 				<TextInput
 					ref={component => this.component = component}
-					style={styles.textBoxInput}
+					style={[styles.textBoxInput, { color: themes[theme].bodyText }]}
 					returnKeyType='default'
 					keyboardType='twitter'
 					blurOnSubmit={false}