Skip to content

Commit 164ccc0

Browse files
SDK update for MRN-860
1 parent 5c3daf0 commit 164ccc0

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ android {
8888
minSdkVersion rootProject.ext.minSdkVersion
8989
targetSdkVersion rootProject.ext.targetSdkVersion
9090
versionCode 1
91-
versionName "3.0.15"
91+
versionName "3.0.16"
9292
/** Add this for react-native-camera */
9393
missingDimensionStrategy 'react-native-camera', 'general'
9494
multiDexEnabled true

android/fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ platform :android do
5454
firebase_app_distribution(
5555
app: "1:235373697524:android:8b3becf8d8ff9be3a0c1a1",
5656
groups: "reactnative",
57-
release_notes: "React-Native ios build for bug-fixes MRN-882 MRN-883",
57+
release_notes: "React-Native ios build for bug-fixes MRN-868,MRN-880,MRN-864",
5858
apk_path: "../android/app/build/outputs/apk/release/app-release.apk",
5959
firebase_cli_token: "1//0gfTJ_oWJ0mHNCgYIARAAGBASNwF-L9IrYZM4cUIV5EB8gVnSvtMC6Q7aAtgrgG8R1ybhSY1Np_5r5UuZu28N144_weOQDyONcW4",
6060
)

ios/fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lane :qa_firebase do
2929
firebase_app_distribution(
3030
app: "1:695832127329:ios:f8b6b0fab296a800",
3131
groups: "reactnative",
32-
release_notes: "React-Native ios build for bug-fixes MRN-882 MRN-883",
32+
release_notes: "React-Native ios build for bug-fixes MRN-868,MRN-880,MRN-864",
3333
firebase_cli_path: "/usr/local/bin/firebase",
3434
firebase_cli_token: "1//0g53oUKW5j5bJCgYIARAAGBASNwF-L9Ir7Ei_6NzWEsyHOMMXytlesfgXShhLeJWRwbcf2MC3e7BaC5dwYlUZB-_osuQFsxy0Du0"
3535
)

ios/mirrorfly_rn.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@
660660
"$(inherited)",
661661
"@executable_path/Frameworks",
662662
);
663-
MARKETING_VERSION = 3.0.15;
663+
MARKETING_VERSION = 3.0.16;
664664
OTHER_LDFLAGS = (
665665
"$(inherited)",
666666
"-ObjC",
@@ -693,7 +693,7 @@
693693
"$(inherited)",
694694
"@executable_path/Frameworks",
695695
);
696-
MARKETING_VERSION = 3.0.15;
696+
MARKETING_VERSION = 3.0.16;
697697
OTHER_LDFLAGS = (
698698
"$(inherited)",
699699
"-ObjC",

src/SDK/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/helpers/chatHelpers.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ export const mediaObjContructor = (_package, file) => {
527527
mediaObj.duration = file.duration;
528528
mediaObj.filename = file.fileName;
529529
mediaObj.type = file.fileType;
530+
mediaObj.audioType = file?.audioType;
530531
return mediaObj;
531532
default:
532533
break;

src/hooks/useMediaProgress.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { useDispatch } from 'react-redux';
33
import { useNetworkStatus } from '../common/hooks';
4-
import { getCurrentChatUser, getUserIdFromJid, showToast } from '../helpers/chatHelpers';
4+
import { getCurrentChatUser, getUserIdFromJid, mediaObjContructor, showToast } from '../helpers/chatHelpers';
55
import { mediaStatusConstants } from '../helpers/constants';
66
import { updateMediaStatus } from '../redux/chatMessageDataSlice';
77
import { getMediaProgress, useChatMessage } from '../redux/reduxHook';
@@ -109,10 +109,14 @@ const useMediaProgress = ({ uploadStatus = 0, downloadStatus = 0, msgId }) => {
109109
userId,
110110
is_uploading: 1,
111111
};
112-
const { msgId: _msgId, msgBody: { media = {}, media: { file = {} } = {} } = {} } = chatMessage;
112+
const { msgId: _msgId, msgBody: { media = {} } = {} } = chatMessage;
113+
const updatedFile = {
114+
...media.file,
115+
fileDetails: mediaObjContructor('REDUX', media),
116+
};
117+
const _file = media.file || updatedFile;
113118
dispatch(updateMediaStatus(retryObj));
114-
115-
uploadFileToSDK(file, chatUser, _msgId, media);
119+
uploadFileToSDK(_file, chatUser, _msgId, media);
116120
};
117121

118122
const cancelProgress = async () => {

0 commit comments

Comments
 (0)