Skip to content

Commit 0e32cf8

Browse files
kadhar03Vanithacontus
authored andcommitted
Merged in uat (pull request #183)
#CONTUIMSER-39878 #CONTUIMSER-39862 Approved-by: vanitha.g
2 parents 6fbec09 + 4af7eee commit 0e32cf8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1647
-953
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ node_modules/
4040
npm-debug.log
4141
yarn-error.log
4242
package-lock.json
43+
yarn.lock
4344

4445
# fastlane
4546
#

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ android {
8282
minSdkVersion rootProject.ext.minSdkVersion
8383
targetSdkVersion rootProject.ext.targetSdkVersion
8484
versionCode 1
85-
versionName "2.4.29"
85+
versionName "2.4.33"
8686
/** Add this for react-native-camera */
8787
missingDimensionStrategy 'react-native-camera', 'general'
8888
multiDexEnabled true

android/app/src/main/java/com/mirrorfly_rn/ActivityModule.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,16 @@ private boolean isLockScreenDisabled() {
147147
return false;
148148
}
149149

150+
@ReactMethod
151+
public void addListener(String eventName) {
152+
// Keep: Required for RN built in Event Emitter Calls.
153+
}
154+
155+
@ReactMethod
156+
public void removeListeners(Integer count) {
157+
// Keep: Required for RN built in Event Emitter Calls.
158+
}
159+
150160
@ReactMethod
151161
public void openActivity() {
152162
Intent intent = new Intent(getReactApplicationContext(), CallScreenActivity.class);

android/app/src/main/java/com/mirrorfly_rn/AudioRoutingModule.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@ public void getAudioRoutes(Promise promise) {
175175
}
176176
}
177177

178+
@ReactMethod
179+
public void addListener(String eventName) {
180+
// Keep: Required for RN built in Event Emitter Calls.
181+
}
182+
183+
@ReactMethod
184+
public void removeListeners(Integer count) {
185+
// Keep: Required for RN built in Event Emitter Calls.
186+
}
187+
178188
private String getSelectedAudioRoute(AudioManager audioManager) {
179189
if (audioManager.isBluetoothScoOn()) {
180190
return "Bluetooth";

android/app/src/main/java/com/mirrorfly_rn/BluetoothHeadsetDetectModule.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ private static String getCurrentOutputDevicePreMarshmallow(AudioManager audioMan
5353
}
5454
}
5555

56+
@ReactMethod
57+
public void addListener(String eventName) {
58+
// Keep: Required for RN built in Event Emitter Calls.
59+
}
60+
61+
@ReactMethod
62+
public void removeListeners(Integer count) {
63+
// Keep: Required for RN built in Event Emitter Calls.
64+
}
65+
5666
private static String getCurrentOutputDeviceMarshmallow(AudioManager audioManager) {
5767
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
5868
AudioDeviceInfo[] devices = new AudioDeviceInfo[0];

android/app/src/main/java/com/mirrorfly_rn/PipAndroidModule.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ public static void openPipSettings(Context context) {
5858
}
5959
}
6060

61+
@ReactMethod
62+
public void addListener(String eventName) {
63+
// Keep: Required for RN built in Event Emitter Calls.
64+
}
65+
66+
@ReactMethod
67+
public void removeListeners(Integer count) {
68+
// Keep: Required for RN built in Event Emitter Calls.
69+
}
70+
6171
@Override
6272
@NonNull
6373
public String getName() {

android/app/src/main/java/com/mirrorfly_rn/RingtoneSilentKeyEventModule.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ public void onReceive(Context context, Intent intent) {
3434
public String getName() {
3535
return "RingtoneSilentKeyEventModule";
3636
}
37+
38+
@ReactMethod
39+
public void addListener(String eventName) {
40+
// Keep: Required for RN built in Event Emitter Calls.
41+
}
42+
43+
@ReactMethod
44+
public void removeListeners(Integer count) {
45+
// Keep: Required for RN built in Event Emitter Calls.
46+
}
3747

3848
@ReactMethod
3949
public void startListening() {

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 android build for bug-fixes MRN-712, MRN-742, MRN-726, MRN-703, MRN-729, MRN-416, MRN-438, MRN-377, MRN-426",
57+
release_notes: "React-Native android build for bug-fixes MRN-759",
5858
apk_path: "../android/app/build/outputs/apk/release/app-release.apk",
5959
firebase_cli_token: "1//0gfTJ_oWJ0mHNCgYIARAAGBASNwF-L9IrYZM4cUIV5EB8gVnSvtMC6Q7aAtgrgG8R1ybhSY1Np_5r5UuZu28N144_weOQDyONcW4",
6060
)

ios/Podfile.lock

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ PODS:
1010
- React-Core (= 0.72.10)
1111
- React-jsi (= 0.72.10)
1212
- ReactCommon/turbomodule/core (= 0.72.10)
13-
- Firebase/CoreOnly (10.27.0):
14-
- FirebaseCore (= 10.27.0)
15-
- Firebase/Messaging (10.27.0):
13+
- Firebase/CoreOnly (10.29.0):
14+
- FirebaseCore (= 10.29.0)
15+
- Firebase/Messaging (10.29.0):
1616
- Firebase/CoreOnly
17-
- FirebaseMessaging (~> 10.27.0)
18-
- FirebaseCore (10.27.0):
17+
- FirebaseMessaging (~> 10.29.0)
18+
- FirebaseCore (10.29.0):
1919
- FirebaseCoreInternal (~> 10.0)
2020
- GoogleUtilities/Environment (~> 7.12)
2121
- GoogleUtilities/Logger (~> 7.12)
22-
- FirebaseCoreExtension (10.28.0):
22+
- FirebaseCoreExtension (10.29.0):
2323
- FirebaseCore (~> 10.0)
24-
- FirebaseCoreInternal (10.28.0):
24+
- FirebaseCoreInternal (10.29.0):
2525
- "GoogleUtilities/NSData+zlib (~> 7.8)"
26-
- FirebaseInstallations (10.28.0):
26+
- FirebaseInstallations (10.29.0):
2727
- FirebaseCore (~> 10.0)
2828
- GoogleUtilities/Environment (~> 7.8)
2929
- GoogleUtilities/UserDefaults (~> 7.8)
3030
- PromisesObjC (~> 2.1)
31-
- FirebaseMessaging (10.27.0):
31+
- FirebaseMessaging (10.29.0):
3232
- FirebaseCore (~> 10.0)
3333
- FirebaseInstallations (~> 10.0)
3434
- GoogleDataTransport (~> 9.3)
@@ -389,15 +389,15 @@ PODS:
389389
- React-Core
390390
- react-native-camera/RN (4.2.1):
391391
- React-Core
392-
- react-native-cameraroll (7.8.1):
392+
- react-native-cameraroll (7.8.3):
393393
- RCT-Folly (= 2021.07.22.00)
394394
- React-Core
395395
- react-native-compressor (1.8.25):
396396
- RCT-Folly (= 2021.07.22.00)
397397
- React-Core
398398
- react-native-contacts (7.0.8):
399399
- React-Core
400-
- react-native-create-thumbnail (2.0.0):
400+
- react-native-create-thumbnail (1.6.4):
401401
- React-Core
402402
- react-native-document-picker (9.3.0):
403403
- React-Core
@@ -422,7 +422,7 @@ PODS:
422422
- react-native-pager-view (6.3.3):
423423
- RCT-Folly (= 2021.07.22.00)
424424
- React-Core
425-
- react-native-safe-area-context (4.10.5):
425+
- react-native-safe-area-context (4.10.8):
426426
- React-Core
427427
- react-native-simple-toast (3.3.1):
428428
- React-Core
@@ -545,7 +545,7 @@ PODS:
545545
- React-jsi (= 0.72.10)
546546
- React-logger (= 0.72.10)
547547
- React-perflogger (= 0.72.10)
548-
- ReactNativeIncallManager (4.2.0):
548+
- ReactNativeIncallManager (4.1.0):
549549
- React-Core
550550
- RealmJS (11.10.2):
551551
- React
@@ -560,11 +560,11 @@ PODS:
560560
- React-Core
561561
- RNConvertPhAsset (1.0.3):
562562
- React
563-
- RNFBApp (20.1.0):
564-
- Firebase/CoreOnly (= 10.27.0)
563+
- RNFBApp (20.3.0):
564+
- Firebase/CoreOnly (= 10.29.0)
565565
- React-Core
566-
- RNFBMessaging (20.1.0):
567-
- Firebase/Messaging (= 10.27.0)
566+
- RNFBMessaging (20.3.0):
567+
- Firebase/Messaging (= 10.29.0)
568568
- FirebaseCoreExtension
569569
- React-Core
570570
- RNFBApp
@@ -600,7 +600,7 @@ PODS:
600600
- RNSound/Core (= 0.11.2)
601601
- RNSound/Core (0.11.2):
602602
- React-Core
603-
- RNSVG (15.3.0):
603+
- RNSVG (14.2.0):
604604
- React-Core
605605
- RNVoipPushNotification (3.3.2):
606606
- React-Core
@@ -878,12 +878,12 @@ SPEC CHECKSUMS:
878878
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
879879
FBLazyVector: f91d538f197fa71a7d5b77ec2069d49550c0eb96
880880
FBReactNativeSpec: b13d1c23d6ed82d6b66aad7a253edf8ba76c4a4c
881-
Firebase: 26b040b20866a55f55eb3611b9fcf3ae64816b86
882-
FirebaseCore: a2b95ae4ce7c83ceecfbbbe3b6f1cddc7415a808
883-
FirebaseCoreExtension: f63147b723e2a700fe0f34ec6fb7f358d6fe83e0
884-
FirebaseCoreInternal: 58d07f1362fddeb0feb6a857d1d1d1c5e558e698
885-
FirebaseInstallations: 60c1d3bc1beef809fd1ad1189a8057a040c59f2e
886-
FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e
881+
Firebase: cec914dab6fd7b1bd8ab56ea07ce4e03dd251c2d
882+
FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
883+
FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
884+
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
885+
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
886+
FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
887887
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
888888
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
889889
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
@@ -910,10 +910,10 @@ SPEC CHECKSUMS:
910910
React-logger: dc3a2b174d79c2da635059212747d8d929b54e06
911911
react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
912912
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
913-
react-native-cameraroll: 1184a0e640f2660b39cf9c64fa396b9059e9c325
913+
react-native-cameraroll: f067fd2a6b8e80b31307d145a118d4324a264c8a
914914
react-native-compressor: 3f05b3b6153f31ed5c4145ed293396a19f6ff52a
915915
react-native-contacts: cb4f3b823550adbce0802901b9e63bf1526ec0af
916-
react-native-create-thumbnail: ab55d24aea01723cf386f18b0b542aabb1982f27
916+
react-native-create-thumbnail: e022bcdcba8a0b4529a50d3fa1a832ec921be39d
917917
react-native-document-picker: 5b97e24a7f1a1e4a50a72c540a043f32d29a70a2
918918
react-native-geocoder: 757427682892bb256f3b3745858cc90eba148a8e
919919
react-native-geolocation-service: 608e1da71a1ac31b4de64d9ef2815f697978c55b
@@ -925,7 +925,7 @@ SPEC CHECKSUMS:
925925
react-native-maps: 667f9b975549c6fa9b1631bf859440f68ebd3b8f
926926
react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc
927927
react-native-pager-view: 7ad123a253d73975a0e3518a52ef09361484cfa8
928-
react-native-safe-area-context: a240ad4b683349e48b1d51fed1611138d1bdad97
928+
react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371
929929
react-native-simple-toast: 1f1cc551d419bc0ab05dcb0136554006c274789d
930930
react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
931931
react-native-webrtc: 8b024c7bb9a005d2b9efeba4c691172dbd00268d
@@ -946,15 +946,15 @@ SPEC CHECKSUMS:
946946
React-runtimescheduler: 68353a05c25b32d442610ef19af377f2b198f3fe
947947
React-utils: a715392dfaaa383668566e400f40493093c08d7e
948948
ReactCommon: a655a8b61cc80c7cabd8db83f69e6f498d4d0894
949-
ReactNativeIncallManager: bfc9c67358cd524882a7c4116dcb311ac2293d4b
949+
ReactNativeIncallManager: 2385505fa5dfdbbc78925e3b8d23b30ce0cde40e
950950
RealmJS: 73a36da3cbbe85e1bdcbf55683172b51f35070d3
951951
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
952952
RNAudioRecorderPlayer: f3b4f32d5581a44be0f9eb383dc87f98f941b08b
953953
RNCCheckbox: a3ca9978cb0846b981d28da4e9914bd437403d77
954954
RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
955955
RNConvertPhAsset: 9b366b8a1abc194b76572712c6f7dd89c9e4e37f
956-
RNFBApp: 9acbe359ef3559d6f8ca5c350db471f2b352f98a
957-
RNFBMessaging: b82ef70d252500d3ad104284c0c7f8e1cd22b51e
956+
RNFBApp: 793adb33298db7e67dc365dc1ec0dc8a55a7a044
957+
RNFBMessaging: 62b6c25f58225a73067c7aef25947f41aa6088c5
958958
RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
959959
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
960960
RNGestureHandler: 972ca9d35b54c108637dd07055f718446b9276d4
@@ -963,7 +963,7 @@ SPEC CHECKSUMS:
963963
RNPermissions: 8d958bf0fd34aca7059a935110dca4ee9140d1b6
964964
RNScreens: 835807a1f3c74c8ea0d0b9e089bf14333141f17f
965965
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
966-
RNSVG: 7c3f3fac9de6d67eee5525a8bafffafaaf022991
966+
RNSVG: 963a95f1f5d512a13d11ffd50d351c87fb5c6890
967967
RNVoipPushNotification: 543e18f83089134a35e7f1d2eba4c8b1f7776b08
968968
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
969969
Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
@@ -972,4 +972,4 @@ SPEC CHECKSUMS:
972972

973973
PODFILE CHECKSUM: be6dfa6a5c091905d5d9e545be0aabb4e21598b7
974974

975-
COCOAPODS: 1.12.1
975+
COCOAPODS: 1.15.2

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-712, MRN-742, MRN-726, MRN-703, MRN-729, MRN-416, MRN-438, MRN-377, MRN-426",
32+
release_notes: "React-Native ios build for bug-fixes MRN-759",
3333
firebase_cli_path: "/usr/local/bin/firebase",
3434
firebase_cli_token: "1//0g53oUKW5j5bJCgYIARAAGBASNwF-L9Ir7Ei_6NzWEsyHOMMXytlesfgXShhLeJWRwbcf2MC3e7BaC5dwYlUZB-_osuQFsxy0Du0"
3535
)

0 commit comments

Comments
 (0)