Merge pull request #36 from MirrorFly/release/5.17.4

UIKIT Release SDK 5.17.4 Integrated
MirrorFly · Jul 9, 2024 · 90a9dd1 · 90a9dd1
2 parents a10a6e6 + bb05ff7
commit 90a9dd1
Show file tree

Hide file tree

Showing 20 changed files with 180 additions and 1,372 deletions.
diff --git a/MirrorflyShareKit/ShareKitViewModel.swift b/MirrorflyShareKit/ShareKitViewModel.swift
@@ -13,7 +13,7 @@ import Social
 import CoreServices
 import Contacts
 
-let LICENSE_KEY = "****************"
+let LICENSE_KEY = "*************************"
 let CONTAINER_ID = "group.com.mirrorfly.qa"
 let IS_LIVE = false
 let APP_NAME = "UiKitQa"

diff --git a/MirrorflyUIkit.xcodeproj/project.pbxproj b/MirrorflyUIkit.xcodeproj/project.pbxproj
diff --git a/MirrorflyUIkit.xcodeproj/xcshareddata/xcschemes/UiKitQa.xcscheme b/MirrorflyUIkit.xcodeproj/xcshareddata/xcschemes/UiKitQa.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
-   version = "1.3">
+   LastUpgradeVersion = "1500"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -50,12 +49,6 @@
             ReferencedContainer = "container:MirrorflyUIkit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "-FIRDebugEnabled"
-            isEnabled = "YES">
-         </CommandLineArgument>
-      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist b/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
@@ -6,24 +6,27 @@
 	<dict>
 		<key>UiKitQa.xcscheme_^#shared#^_</key>
 		<dict>
-			<key>isShown</key>
-			<true/>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>89</integer>
 		</dict>
 		<key>UiKitQaNotificationExtention.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>0</integer>
 		</dict>
 		<key>UikitQaShareKit.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>CEA2F92426569C590013F5E8</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>CEC08A9C27E23B0D005E48C5</key>
 		<dict>
 			<key>primary</key>

diff --git a/MirrorflyUIkit.xcworkspace/xcuserdata/john.xcuserdatad/UserInterfaceState.xcuserstate b/MirrorflyUIkit.xcworkspace/xcuserdata/john.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/....xcuserdatad/IDEFindNavigatorScopes.plist → ....xcuserdatad/IDEFindNavigatorScopes.plist b/....xcuserdatad/IDEFindNavigatorScopes.plist → ....xcuserdatad/IDEFindNavigatorScopes.plist
diff --git a/MirrorflyUIkit.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/MirrorflyUIkit.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MirrorflyUIkit.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings b/MirrorflyUIkit.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>ShowSharedSchemesAutomaticallyEnabled</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...atad/xcdebugger/Breakpoints_v2.xcbkptlist → ...atad/xcdebugger/Breakpoints_v2.xcbkptlist b/...atad/xcdebugger/Breakpoints_v2.xcbkptlist → ...atad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Bucket
-   uuid = "ECF3DDAC-E845-40CF-8512-1284FAA226B6"
+   uuid = "4604A8F8-224D-41B4-86C8-942DDBB45E20"
    type = "0"
    version = "2.0">
 </Bucket>
diff --git a/MirrorflyUIkit/Calls/CallLogViewController.swift b/MirrorflyUIkit/Calls/CallLogViewController.swift
@@ -776,7 +776,7 @@ extension CallLogViewController : UITableViewDataSource, UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         seletedCallLog = callLogArray[indexPath.row]
-        
+
         if isGroupOrUserBlocked(callLog: seletedCallLog) {
             return
         }

diff --git a/MirrorflyUIkit/Calls/CallUIViewController.swift b/MirrorflyUIkit/Calls/CallUIViewController.swift
@@ -1393,6 +1393,8 @@ extension CallUIViewController {
                 self.outgoingCallView?.audioWaveView.isHidden = true
                 self.outgoingCallView?.AttendingBottomView.isHidden = true
                 self.outgoingCallView?.callAgainView.isHidden = false
+                self.showHideParticipantButton(hide:  true)
+                self.showHideMenuButton(hide: true)
 
                 if callType == .Audio {
                     self.outgoingCallView?.CallAgainButton.setImage(UIImage(named: "callAgain"), for: .normal)
@@ -2159,7 +2161,7 @@ extension CallUIViewController : CallManagerDelegate {
 
     }
 
-    func getDisplayName(IncomingUser :[String], incomingUserName: String) {
+    func getDisplayName(IncomingUser :[String], incomingUserName: String, metaData: [CallMetadata]) -> [String] {
         var userString = [String]()
         if isHideNotificationContent {
             userString.append(APP_NAME)
@@ -2183,7 +2185,7 @@ extension CallUIViewController : CallManagerDelegate {
             }
             print("#names \(userString)")
         }
-        CallManager.getContactNames(IncomingUserName: userString)
+            return userString
     }
 
     func getGroupName(_ groupId : String) {
@@ -2544,8 +2546,10 @@ extension CallUIViewController : CallManagerDelegate {
                 }
             case .RECONNECTING:
                 print("#STA= #callStatus onCallStatus ====  .RECONNECTING \(userId)  \(self?.members.compactMap({$0.jid})) ||  \(self?.outgoingCallView?.tileCollectionView.numberOfItems(inSection: 0))")
-                self?.showHideParticipantButton(hide:  false)
-                self?.showHideMenuButton(hide: false)
+                if CallManager.isCallConnected() {
+                    self?.showHideParticipantButton(hide:  userId == AppUtils.getMyJid())
+                    self?.showHideMenuButton(hide: userId == AppUtils.getMyJid())
+                }
                 self?.outgoingCallView?.OutgoingRingingStatusLabel?.isHidden = !CallManager.isOneToOneCall()
                 self?.updateCallStatus(jid: userId, status : .reconnecting)
                 if CallManager.isOneToOneCall() || (CallManager.getCallMode() == .MEET && (self?.members.count == 1 || self?.members.count == 2)) {

diff --git a/MirrorflyUIkit/Calls/RootViewController.swift b/MirrorflyUIkit/Calls/RootViewController.swift
@@ -48,11 +48,8 @@ extension RootViewController : CallManagerDelegate {
 
     }
 
-    func getDisplayName(IncomingUser :[String], incomingUserName: String) {
-        DispatchQueue.main.async { [weak self] in
-            self?.callViewController?.getDisplayName(IncomingUser: IncomingUser, incomingUserName: incomingUserName)
-        }
-
+    func getDisplayName(IncomingUser :[String], incomingUserName: String, metaData: [CallMetadata]) -> [String] {
+        return self.callViewController?.getDisplayName(IncomingUser: IncomingUser, incomingUserName: incomingUserName, metaData: metaData) ?? []
     }
 
     func socketConnectionEstablished() {

diff --git a/MirrorflyUIkit/Chat/ChatViewParentController.swift b/MirrorflyUIkit/Chat/ChatViewParentController.swift
@@ -7222,7 +7222,7 @@ extension ChatViewParentController {
 }
 
 extension ChatViewParentController {
-    
+
     @objc func makeCall(_ sender : UIButton){
         print("#callopt \(FlyUtils.printTime()) makeCall from \(AppUtils.getMyJid())")
         if CallManager.isAlreadyOnAnotherCall(){

diff --git a/MirrorflyUIkit/Controllers/Delegates/AppDelegate.swift b/MirrorflyUIkit/Controllers/Delegates/AppDelegate.swift
@@ -21,7 +21,7 @@ import AVFoundation
 import MirrorFlySDK
 
 let BASE_URL = "https://api-preprod-sandbox.mirrorfly.com/api/v1/"
-let LICENSE_KEY = "****************"
+let LICENSE_KEY = "*************************"
 let CONTAINER_ID = "group.com.mirrorfly.qa"
 let ENABLE_CONTACT_SYNC = false
 let ENABLE_CHAT_HISTORY = true
@@ -32,6 +32,8 @@ let APP_NAME = "UiKitQa"
 let ICLOUD_CONTAINER_ID = "iCloud.com.mirrorfly.qa"
 
 
+
+
 let isMigrationDone = "isMigrationDone"
 let isHideNotificationContent = false
 
@@ -713,7 +715,7 @@ extension AppDelegate : LocalNotificationDelegate {
 
 extension AppDelegate : MissedCallNotificationDelegate {
 
-    func onMissedCall(isOneToOneCall: Bool, userJid: String, groupId: String?, callType: String, userList: [String]) {
+    func onMissedCall(isOneToOneCall: Bool, userJid: String, groupId: String?, callType: String, userList: [String], metaData: [CallMetadata]) {
 
         let current = UIApplication.shared.keyWindow?.getTopViewController()
         if (current is CallLogViewController) {

diff --git a/MirrorflyUIkit/GooglePlist/GoogleService-Prod-Info.plist b/MirrorflyUIkit/GooglePlist/GoogleService-Prod-Info.plist
@@ -7,7 +7,7 @@
 	<key>REVERSED_CLIENT_ID</key>
 	<string>com.googleusercontent.apps.795200382606-1nkgsrm42trtrob0fknbau4drrjseqsp</string>
 	<key>API_KEY</key>
-	<string>****************</string>
+	<string>*************************</string>
 	<key>GCM_SENDER_ID</key>
 	<string>795200382606</string>
 	<key>PLIST_VERSION</key>

diff --git a/MirrorflyUIkit/GooglePlist/GoogleService-Qa-Info.plist b/MirrorflyUIkit/GooglePlist/GoogleService-Qa-Info.plist
@@ -7,7 +7,7 @@
 	<key>REVERSED_CLIENT_ID</key>
 	<string>com.googleusercontent.apps.695832127329-qno5q17plh1tdbif57jtf05sakmb9o08</string>
 	<key>API_KEY</key>
-	<string>****************</string>
+	<string>*************************</string>
 	<key>GCM_SENDER_ID</key>
 	<string>695832127329</string>
 	<key>PLIST_VERSION</key>

diff --git a/MirrorflyUIkit/GoogleService-Info.plist b/MirrorflyUIkit/GoogleService-Info.plist
@@ -7,7 +7,7 @@
 	<key>REVERSED_CLIENT_ID</key>
 	<string>com.googleusercontent.apps.695832127329-qno5q17plh1tdbif57jtf05sakmb9o08</string>
 	<key>API_KEY</key>
-	<string>****************</string>
+	<string>*************************</string>
 	<key>GCM_SENDER_ID</key>
 	<string>695832127329</string>
 	<key>PLIST_VERSION</key>

diff --git a/MirrorflyUIkit/Plist/MirrorflyUIkit-info.plist b/MirrorflyUIkit/Plist/MirrorflyUIkit-info.plist
@@ -155,10 +155,10 @@
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
 	<key>googleApiKey</key>
-	<string>****************</string>
+	<string>*************************</string>
 	<key>googleApiKeyStaticMap</key>
-	<string>****************</string>
+	<string>*************************</string>
 	<key>googleApiKey_Translation</key>
-	<string>****************</string>
+	<string>*************************</string>
 </dict>
 </plist>
diff --git a/NotificationExtention/NotificationService.swift b/NotificationExtention/NotificationService.swift
@@ -10,7 +10,7 @@ import AVFoundation
 import AudioToolbox
 import MirrorFlySDK
 
-let LICENSE_KEY = "****************"
+let LICENSE_KEY = "*************************"
 let CONTAINER_ID = "group.com.mirrorfly.qa"
 let IS_LIVE = false
 let APP_NAME = "UiKitQa"

diff --git a/Podfile b/Podfile
@@ -31,13 +31,13 @@ def uikit_pods
   pod 'lottie-ios', '4.4.3'
   pod 'BottomSheet', :git => 'https://github.com/joomcode/BottomSheet'
 
-  pod 'MirrorFlySDK', '5.17.2'
+  pod 'MirrorFlySDK', '5.17.4'
 
 end
 
 def notification_pods
 
-  pod 'MirrorFlySDK', '5.17.2'
+  pod 'MirrorFlySDK', '5.17.4'
 
 end
 
@@ -49,22 +49,10 @@ target 'UiKitQaNotificationExtention' do
   notification_pods
 end
 
-target 'Mirrorfly' do
-  uikit_pods
-end
-
-target 'MirrorflyNotificationExtention' do
-  notification_pods
-end
-
 target 'UikitQaShareKit' do
   uikit_pods
 end
 
-target 'MirrorflyShareKit' do
-  uikit_pods
-end
-
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-Original file line number
+Diff line change
@@ Expand Up @@
         func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
             seletedCallLog = callLogArray[indexPath.row]
             if isGroupOrUserBlocked(callLog: seletedCallLog) {
                 return
             }
@@ Expand Down @@