chore: Merge 4.58.0 into master (#6199)

Author: diegolmello

android/app/build.gradle

@@ -106,6 +106,7 @@ android {
 
     signingConfigs {
         release {
+            v1SigningEnabled false
             if (project.hasProperty('KEYSTORE')) {
                 storeFile file(KEYSTORE)
                 storePassword KEYSTORE_PASSWORD
@@ -195,7 +196,6 @@ dependencies {
     }
 
     implementation project(':@react-native-community_viewpager')
-    // implementation "androidx.core:core-splashscreen:1.0.0"
     playImplementation project(':react-native-notifications')
     playImplementation "com.google.firebase:firebase-messaging:23.3.1"
     playImplementation project(':@react-native-firebase_app')
@@ -204,14 +204,10 @@ dependencies {
     implementation project(':watermelondb-jsi')
 
     implementation "com.google.code.gson:gson:2.8.9"
-    implementation "com.github.bumptech.glide:glide:4.9.0"
-    annotationProcessor "com.github.bumptech.glide:compiler:4.9.0"
     implementation "com.tencent:mmkv-static:1.2.10"
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.facebook.soloader:soloader:0.10.4'
-    implementation("com.facebook.fresco:animated-gif:2.5.0")
-    implementation "com.facebook.fresco:imagepipeline-okhttp3:3.1.3"
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

android/app/src/main/assets/fonts/custom.ttf

@@ -36,10 +36,9 @@
 
 import com.reactnativecommunity.webview.RNCWebViewManager;
 
-import com.dylanvann.fastimage.FastImageOkHttpUrlLoader;
-
 import expo.modules.av.player.datasource.SharedCookiesDataSourceFactory;
 import expo.modules.filesystem.FileSystemModule;
+import expo.modules.image.okhttp.ExpoImageOkHttpClientGlideModule;
 
 public class SSLPinningModule extends ReactContextBaseJavaModule implements KeyChainAliasCallback {
 
@@ -98,24 +97,26 @@ public void alias(String alias) {
     @ReactMethod
     public void setCertificate(String data, Promise promise) {
         this.alias = data;
+        OkHttpClient client = getOkHttpClient();
 
         // HTTP Fetch react-native layer
         NetworkingModule.setCustomClientBuilder(new CustomClient());
         // Websocket react-native layer
         WebSocketModule.setCustomClientBuilder(new CustomClient());
         // Image networking react-native layer
         ImagePipelineConfig config = OkHttpImagePipelineConfigFactory
-            .newBuilder(this.reactContext, getOkHttpClient())
+            .newBuilder(this.reactContext, client)
             .build();
         Fresco.initialize(this.reactContext, config);
         // RNCWebView onReceivedClientCertRequest
         RNCWebViewManager.setCertificateAlias(data);
-        // FastImage Glide network layer
-        FastImageOkHttpUrlLoader.setOkHttpClient(getOkHttpClient());
+
         // Expo AV network layer
-        SharedCookiesDataSourceFactory.setOkHttpClient(getOkHttpClient());
+        SharedCookiesDataSourceFactory.setOkHttpClient(client);
         // Expo File System network layer
-        FileSystemModule.setOkHttpClient(getOkHttpClient());
+        FileSystemModule.setOkHttpClient(client);
+        // Expo Image network layer
+        ExpoImageOkHttpClientGlideModule.Companion.setOkHttpClient(client);
 
         promise.resolve(null);
     }

android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java

@@ -4,7 +4,7 @@ buildscript {
 
     ext {
         buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
+        minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
         ndkVersion = "25.1.8937393"

android/build.gradle

@@ -1,6 +1,6 @@
 import React from 'react';
 import { View } from 'react-native';
-import FastImage from 'react-native-fast-image';
+import { Image } from 'expo-image';
 import Touchable from 'react-native-platform-touchable';
 import { settings as RocketChatSettings } from '@rocket.chat/sdk';
 
@@ -79,13 +79,13 @@ const Avatar = React.memo(
 			}
 
 			image = (
-				<FastImage
+				<Image
 					style={avatarStyle}
 					source={{
 						uri,
-						headers: RocketChatSettings.customHeaders,
-						priority: FastImage.priority.high
+						headers: RocketChatSettings.customHeaders
 					}}
+					priority='high'
 				/>
 			);
 		}

app/containers/Avatar/Avatar.tsx

@@ -166,6 +166,8 @@ export const mappedIcons = {
 	'prune': 59817,
 	'queue': 59818,
 	'quote': 59819,
+	'radio-checked': 59855,
+	'radio-unchecked': 59867,
 	'reaction-add': 59820,
 	'record': 59821,
 	'refresh': 59822,

app/containers/CustomIcon/mappedIcons.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { StyleProp } from 'react-native';
-import FastImage, { ImageStyle } from 'react-native-fast-image';
+import { Image, ImageStyle } from 'expo-image';
 
 import { useAppSelector } from '../../lib/hooks';
 import { ICustomEmoji } from '../../definitions';
@@ -14,13 +14,12 @@ const CustomEmoji = React.memo(
 	({ emoji, style }: ICustomEmojiProps) => {
 		const baseUrl = useAppSelector(state => state.server.server);
 		return (
-			<FastImage
+			<Image
 				style={style}
 				source={{
-					uri: `${baseUrl}/emoji-custom/${encodeURIComponent(emoji.name)}.${emoji.extension}`,
-					priority: FastImage.priority.high
+					uri: `${baseUrl}/emoji-custom/${encodeURIComponent(emoji.name)}.${emoji.extension}`
 				}}
-				resizeMode={FastImage.resizeMode.contain}
+				contentFit='contain'
 			/>
 		);
 	},

app/containers/CustomIcon/selection.json

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
-import { LayoutChangeEvent, StyleSheet, StyleProp, ViewStyle, ImageStyle, View } from 'react-native';
+import { LayoutChangeEvent, StyleSheet, StyleProp, ViewStyle, View } from 'react-native';
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import Animated, { withTiming, useSharedValue, useAnimatedStyle, withSpring } from 'react-native-reanimated';
-import FastImage from 'react-native-fast-image';
+import { Image, ImageStyle } from 'expo-image';
 
 import { useTheme } from '../../theme';
 
@@ -114,10 +114,10 @@ export const ImageViewer = ({ uri = '', width, height, ...props }: ImageViewerPr
 		<View style={[styles.flex, { width, height, backgroundColor: colors.surfaceNeutral }]}>
 			<GestureDetector gesture={gesture}>
 				<Animated.View onLayout={onLayout} style={[styles.flex, style]}>
-					<FastImage
+					<Image
 						// @ts-ignore
 						style={styles.image}
-						resizeMode='contain'
+						contentFit='contain'
 						source={{ uri }}
 						{...props}
 					/>

app/containers/EmojiPicker/CustomEmoji.tsx

@@ -29,7 +29,7 @@ const ListHeader = React.memo(({ title, translateTitle = true, numberOfLines = 1
 
 	return (
 		<View style={styles.container}>
-			<Text style={[styles.title, { color: themes[theme].fontHint }]} numberOfLines={numberOfLines}>
+			<Text accessibilityRole='header' style={[styles.title, { color: themes[theme].fontHint }]} numberOfLines={numberOfLines}>
 				{translateTitle ? I18n.t(title) : title}
 			</Text>
 		</View>