@kaleyra/video-react-native-module 1.5.0 → 2.0.0

package/native-bridge/iOS/Source/User Details/Providers/UsersDetailsProvider.swift

@@ -3,37 +3,24 @@
 
 import Foundation
 import CallKit
-import Bandyer
+import KaleyraVideoSDK
 
-@available(iOS 12.0, *)
 class UsersDetailsProvider: NSObject, UserDetailsProvider {
 
     private let cache: UsersDetailsCache
-    private let formatter: Formatter
 
-    init(cache: UsersDetailsCache, formatter: Formatter) {
+    init(cache: UsersDetailsCache) {
         self.cache = cache
-        self.formatter = formatter
         super.init()
     }
 
-    func provideDetails(_ userIds: [String], completion: @escaping ([Bandyer.UserDetails]) -> Void) {
-        completion(detailsFor(userIds: userIds))
+    func provideDetails(_ userIds: [String], completion: @escaping (Result<[KaleyraVideoSDK.UserDetails], any Error>) -> Void) {
+        completion(.success(detailsFor(userIds: userIds)))
     }
 
-    func provideHandle(_ userIds: [String], completion: @escaping (CXHandle) -> Void) {
-        completion(handleFor(userIds: userIds))
-    }
-
-    private func detailsFor(userIds: [String]) -> [Bandyer.UserDetails] {
+    private func detailsFor(userIds: [String]) -> [KaleyraVideoSDK.UserDetails] {
         userIds.map { id in
-            cache.item(forKey: id) ?? .init(userID: id)
+            cache.item(forKey: id) ?? .init(userId: id)
         }
     }
-
-    private func handleFor(userIds: [String]) -> CXHandle {
-        guard !userIds.isEmpty else { return .init(type: .generic, value: "") }
-        let details = detailsFor(userIds: userIds)
-        return .init(type: .generic, value: formatter.string(for: details) ?? userIds.joined(separator: ", ") )
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaleyra/video-react-native-module",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "private": false,
   "description": "Kaleyra Video module for react native.",
   "main": "lib/commonjs/index.js",
@@ -48,10 +48,9 @@
     "doc": "typedoc",
     "openDoc": "open ./docs/index.html",
     "version": "npm run doc && python3 update_plugin_version.py && npm run buildJs && git add . ",
-    "postversion": "git push && git push --tags",
-    "major": "npm version major -m \"Updated to version %s\"",
-    "minor": "npm version minor -m \"Updated to version %s\"",
-    "patch": "npm version patch -m \"Updated to version %s\""
+    "major": "npm version major -m \"chore: updated to version %s\"",
+    "minor": "npm version minor -m \"chore: updated to version %s\"",
+    "patch": "npm version patch -m \"chore: updated to version %s\""
   },
   "keywords": [
     "react-native",
@@ -70,8 +69,10 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.15.0",
     "@evilmartians/lefthook": "^1.2.2",
-    "@react-native-community/eslint-config": "^3.0.2",
+    "@react-native/eslint-config": "^0.76.3",
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^28.1.2",
     "@types/react": "~18.2.79",
@@ -80,15 +81,15 @@
     "@typescript-eslint/parser": "^5.60.0",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
-    "eslint": "^8.43.0",
+    "eslint": "^9.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^28.1.1",
+    "jest": "^29.2.1",
     "pod-install": "^0.1.0",
-    "prettier": "^2.0.5",
+    "prettier": "^3.3.3",
     "quicktype": "^16.0.43",
-    "react": "18.2.0",
-    "react-native": "0.70.15",
+    "react": "18.3.1",
+    "react-native": "^0.74.6",
     "typedoc": "^0.24.4",
     "typescript": "^4.9.5"
   },

package/src/KaleyraVideo.ts

@@ -5,8 +5,6 @@ import { NativeModules, Platform } from 'react-native';
 import type { KaleyraVideoConfiguration } from '../native-bridge/TypeScript/types/KaleyraVideoConfiguration';
 import type { CreateCallOptions } from '../native-bridge/TypeScript/types/CreateCallOptions';
 import type { UserDetails } from '../native-bridge/TypeScript/types/UserDetails';
-import type { UserDetailsFormat } from '../native-bridge/TypeScript/types/UserDetailsFormat';
-import { UserDetailsFormatValidator } from '../native-bridge/TypeScript/UserDetailsFormatValidator';
 import { CallType } from '../native-bridge/TypeScript/types/CallType';
 import { IllegalArgumentError } from '../native-bridge/TypeScript/errors/IllegalArgumentError';
 import { Environments } from '../native-bridge/TypeScript/Environments';
@@ -195,19 +193,6 @@ class KaleyraVideo {
     VideoNativeModuleBridge.startCall(JSON.stringify(callOptions));
   }
 
-  /**
-   * Verify the user for the current call
-   * @param verify true if the user is verified, false otherwise
-   * @throws IllegalArgumentError
-   */
-  verifyCurrentCall(verify: boolean) {
-    if (KaleyraVideo._isAndroid()) {
-      VideoNativeModuleBridge.verifyCurrentCall(verify);
-    } else {
-      console.warn('Not yet supported on ', Platform.OS, ' platform.');
-    }
-  }
-
   /**
    * Set the UI display mode for the current call
    * @param mode FOREGROUND, FOREGROUND_PICTURE_IN_PICTURE, BACKGROUND
@@ -249,16 +234,6 @@ class KaleyraVideo {
     VideoNativeModuleBridge.addUsersDetails(JSON.stringify(userDetails));
   }
 
-  setUserDetailsFormat(format: UserDetailsFormat) {
-    const validator = new UserDetailsFormatValidator();
-    validator.validate(format.default);
-    if (format.androidNotification !== undefined) {
-      validator.validate(format.androidNotification);
-    }
-
-    VideoNativeModuleBridge.setUserDetailsFormat(JSON.stringify(format));
-  }
-
   /**
    * Call this method to remove all the user details previously provided.
    */
@@ -266,22 +241,6 @@ class KaleyraVideo {
     VideoNativeModuleBridge.removeUsersDetails();
   }
 
-  /**
-   * Call this method to handle a notification!
-   *
-   * @param payload notification data payload as String
-   * @throws IllegalArgumentError
-   */
-  handlePushNotificationPayload(payload: string) {
-    if (payload === '' || payload === 'undefined') {
-      throw new IllegalArgumentError('Expected a not empty payload!');
-    }
-
-    VideoNativeModuleBridge.handlePushNotificationPayload(
-      JSON.stringify(payload),
-    );
-  }
-
   /**
    * Open chat
    * @param userID user you want to chat with
@@ -335,7 +294,6 @@ export {
   CallType,
   Regions,
   UserDetails,
-  UserDetailsFormat,
   CallDisplayMode,
   Session,
   Environments,

package/video-react-native-module.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "10.0" }
+  s.platforms    = { :ios => "15.0" }
   s.source       = { :git => "git@github.com:KaleyraVideo/VideoReactNativeModule.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}", "native-bridge/iOS/Source/**/*.swift"
@@ -19,12 +19,12 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
 
   podfile = Pod::Podfile.from_file(Pathname.new('native-bridge/iOS/Podfile'))
-  pod = podfile.dependencies.select { |pod| pod.name == "Bandyer" }
+  pod = podfile.dependencies.select { |pod| pod.name == "KaleyraVideoSDK" }
 
   if defined?($KaleyraNoWebRTC)
-    s.dependency "Bandyer/Core", pod[0].requirement.to_s
+    s.dependency "KaleyraVideoSDK/Core", pod[0].requirement.to_s
   else
-    s.dependency "Bandyer", pod[0].requirement.to_s
+    s.dependency "KaleyraVideoSDK", pod[0].requirement.to_s
   end
 
   # Don't install the dependencies when we run `pod install` in the old architecture.

package/lib/commonjs/native-bridge/TypeScript/UserDetailsFormatValidator.js

@@ -1,32 +0,0 @@
-"use strict";
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserDetailsFormatValidator = void 0;
-const IllegalArgumentError_1 = require("./errors/IllegalArgumentError");
-class UserDetailsFormatValidator {
-    validate(format) {
-        const keywords = this.findKeywords(format);
-        if (keywords.length === 0) {
-            throw new IllegalArgumentError_1.IllegalArgumentError("Could not find any keyword, at least one keyword in the format ${keyword} must be provided");
-        }
-        const allowedKeywords = ["userID", "nickName", "firstName", "lastName", "email", "profileImageUrl"];
-        keywords.forEach((keyword) => {
-            if (allowedKeywords.indexOf(keyword) === -1) {
-                throw new IllegalArgumentError_1.IllegalArgumentError("Declared keyword=${" + keyword + "} is not allowed. The allowedKeywords allowed are: " + allowedKeywords);
-            }
-        });
-    }
-    findKeywords(format) {
-        const regex = /\${([\w]+)}/g;
-        let match;
-        const matches = [];
-        while ((match = regex.exec(format)) !== null) {
-            if (match[1] && match[1] !== null) {
-                matches.push(match[1]);
-            }
-        }
-        return matches;
-    }
-}
-exports.UserDetailsFormatValidator = UserDetailsFormatValidator;

package/lib/commonjs/native-bridge/TypeScript/types/UserDetailsFormat.js

@@ -1,4 +0,0 @@
-"use strict";
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/module/native-bridge/TypeScript/UserDetailsFormatValidator.js

@@ -1,28 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-import { IllegalArgumentError } from "./errors/IllegalArgumentError";
-export class UserDetailsFormatValidator {
-    validate(format) {
-        const keywords = this.findKeywords(format);
-        if (keywords.length === 0) {
-            throw new IllegalArgumentError("Could not find any keyword, at least one keyword in the format ${keyword} must be provided");
-        }
-        const allowedKeywords = ["userID", "nickName", "firstName", "lastName", "email", "profileImageUrl"];
-        keywords.forEach((keyword) => {
-            if (allowedKeywords.indexOf(keyword) === -1) {
-                throw new IllegalArgumentError("Declared keyword=${" + keyword + "} is not allowed. The allowedKeywords allowed are: " + allowedKeywords);
-            }
-        });
-    }
-    findKeywords(format) {
-        const regex = /\${([\w]+)}/g;
-        let match;
-        const matches = [];
-        while ((match = regex.exec(format)) !== null) {
-            if (match[1] && match[1] !== null) {
-                matches.push(match[1]);
-            }
-        }
-        return matches;
-    }
-}

package/lib/module/native-bridge/TypeScript/types/UserDetailsFormat.js

@@ -1,3 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-export {};

package/lib/typescript/native-bridge/TypeScript/UserDetailsFormatValidator.d.ts

@@ -1,4 +0,0 @@
-export declare class UserDetailsFormatValidator {
-    validate(format: string): void;
-    private findKeywords;
-}

package/lib/typescript/native-bridge/TypeScript/types/UserDetailsFormat.d.ts

@@ -1,19 +0,0 @@
-/**
- * This is used to display the user details in the call/chat UI
- */
-export interface UserDetailsFormat {
-    /**
-     * Format to be used to display a user details on the call/chat UI
-     * <br/>
-     * <br/>
-     * <b><font color="blue">default</font>: ${userAlias}</b>
-     */
-    default: string;
-    /**
-     * Format to be used when displaying an android notification
-     * <br/>
-     * <br/>
-     * <b><font color="blue">default</font>: equals to UserDetailsFormatter.default</b>
-     */
-    androidNotification?: string;
-}

package/native-bridge/TypeScript/UserDetailsFormatValidator.ts

@@ -1,35 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-import { IllegalArgumentError } from "./errors/IllegalArgumentError";
-
-export class UserDetailsFormatValidator {
-
-    validate(format: string) {
-        const keywords = this.findKeywords(format);
-
-        if (keywords.length === 0) {
-            throw new IllegalArgumentError("Could not find any keyword, at least one keyword in the format ${keyword} must be provided");
-        }
-
-        const allowedKeywords = ["userID", "nickName", "firstName", "lastName", "email", "profileImageUrl"];
-
-        keywords.forEach((keyword) => {
-            if (allowedKeywords.indexOf(keyword) === -1) {
-                throw new IllegalArgumentError("Declared keyword=${" + keyword + "} is not allowed. The allowedKeywords allowed are: " + allowedKeywords);
-            }
-        });
-    }
-
-    private findKeywords(format: string): string[] {
-        const regex = /\${([\w]+)}/g;
-        let match;
-        const matches: string[] = [];
-        while ((match = regex.exec(format)) !== null) {
-            if (match[1] && match[1] !== null) {
-                matches.push(match[1]);
-            }
-        }
-        return matches;
-    }
-}

package/native-bridge/TypeScript/types/UserDetailsFormat.ts

@@ -1,23 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-/**
- * This is used to display the user details in the call/chat UI
- */
-export interface UserDetailsFormat {
-  /**
-   * Format to be used to display a user details on the call/chat UI
-   * <br/>
-   * <br/>
-   * <b><font color="blue">default</font>: ${userAlias}</b>
-   */
-  default: string;
-
-  /**
-   * Format to be used when displaying an android notification
-   * <br/>
-   * <br/>
-   * <b><font color="blue">default</font>: equals to UserDetailsFormatter.default</b>
-   */
-  androidNotification?: string;
-}

package/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/user_details/CachedUserDetailsFormatter.kt

@@ -1,59 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-package com.kaleyra.video_hybrid_native_bridge.user_details
-
-import android.annotation.SuppressLint
-import android.content.Context
-import com.bandyer.android_sdk.notification.FormatContext
-import com.bandyer.android_sdk.utils.provider.UserDetails
-import com.bandyer.android_sdk.utils.provider.UserDetailsFormatter
-import com.kaleyra.video_hybrid_native_bridge.UserDetailsFormat
-import com.google.gson.Gson
-import java.util.regex.Pattern
-import kotlin.reflect.full.declaredMemberProperties
-
-internal class CachedUserDetailsFormatter private constructor() : UserDetailsFormatter {
-
-    private lateinit var context: Context
-    private lateinit var userDetailsFormat: UserDetailsFormat
-
-    private val preferences by lazy { context.getSharedPreferences(KALEYRA_VIDEO_CACHED_USER_DETAILS_FORMATTER_PREFS, Context.MODE_PRIVATE) }
-    private val gson by lazy { Gson() }
-
-    constructor(context: Context) : this() {
-        this.context = context
-        userDetailsFormat = gson.fromJson(preferences.getString(KALEYRA_VIDEO_CACHED_USER_DETAILS_FORMAT, ""), UserDetailsFormat::class.java)
-    }
-
-    @SuppressLint("ApplySharedPref")
-    constructor(context: Context, userDetailsFormat: UserDetailsFormat) : this() {
-        this.context = context
-        this.userDetailsFormat = userDetailsFormat
-        preferences.edit().putString(KALEYRA_VIDEO_CACHED_USER_DETAILS_FORMAT, gson.toJson(userDetailsFormat)).commit()
-    }
-
-    override fun format(userDetails: UserDetails, context: FormatContext): String = with(userDetails) {
-        if (context.isNotification) userDetailsFormat.androidNotification?.let { formatBy(it) } ?: formatBy(userDetailsFormat.default)
-        else formatBy(userDetailsFormat.default)
-    }
-
-    private fun UserDetails.formatBy(textToFormat: String): String {
-        var output = textToFormat
-        val regex = "(?<=\\$\\{)(.*?)(?=\\})";
-        val p = Pattern.compile(regex);
-        val m = p.matcher(textToFormat);
-        while (m.find()) {
-            val keyword = m.group()
-            val value = UserDetails::class::declaredMemberProperties.get().firstOrNull { it.name == keyword }
-            output = output.replace("\${$keyword}", value?.call(this)?.toString() ?: "\${$keyword}")
-        }
-        return output
-    }
-
-    companion object {
-        private const val KALEYRA_VIDEO_CACHED_USER_DETAILS_FORMATTER_PREFS = "KALEYRA_VIDEO_CACHED_USER_DETAILS_FORMATTER_PREFS"
-        private const val KALEYRA_VIDEO_CACHED_USER_DETAILS_FORMAT = "KALEYRA_VIDEO_CACHED_USER_DETAILS_FORMAT"
-    }
-
-}

package/native-bridge/iOS/Source/Abstractions/BandyerSDKProtocol.swift

@@ -1,25 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-import Foundation
-import Bandyer
-
-@available(iOS 12.0, *)
-protocol BandyerSDKProtocol: AnyObject {
-
-    var config: Bandyer.Config? { get }
-    var userDetailsProvider: Bandyer.UserDetailsProvider? { get set }
-    var callClient: Bandyer.CallClient! { get }
-    var chatClient: Bandyer.ChatClient! { get }
-    var notificationsCoordinator: Bandyer.InAppNotificationsCoordinator? { get }
-    var callRegistry: Bandyer.CallRegistry! { get }
-
-    func configure(_ config: Bandyer.Config)
-    func connect(_ session: Bandyer.Session)
-    func verifiedUser(_ verified: Bool, for call: Bandyer.Call, completion: ((Error?) -> Void)?)
-    func disconnect()
-    func reset()
-}
-
-@available(iOS 12.0, *)
-extension BandyerSDK: BandyerSDKProtocol {}

package/native-bridge/iOS/Source/DTOs/AudioCallOptions+Bandyer.swift

@@ -1,14 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-import Foundation
-import Bandyer
-
-@available(iOS 12.0, *)
-extension AudioCallOptions {
-
-    var callOptions: Bandyer.CallOptions {
-        .init(callType: type.callType,
-              recordingType: recordingType.callRecordingType)
-    }
-}

package/native-bridge/iOS/Source/DTOs/CallOptions+Bandyer.swift

@@ -1,14 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-import Foundation
-import Bandyer
-
-@available(iOS 12.0, *)
-extension CallOptions {
-
-    var callOptions: Bandyer.CallOptions {
-        .init(callType: .audioVideo,
-              recordingType: recordingType.callRecordingType)
-    }
-}

package/native-bridge/iOS/Source/DTOs/CreateCallOptions+Intent.swift

@@ -1,17 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-import Foundation
-import Bandyer
-
-@available(iOS 12.0, *)
-extension CreateCallOptions {
-
-    func makeStartOutgoingCallIntent() -> StartOutgoingCallIntent {
-        .init(callees: callees, options: makeCallOptions())
-    }
-
-    private func makeCallOptions() -> Bandyer.CallOptions {
-        .init(callType: callType.bandyerType, recordingType: recordingType?.callRecordingType ?? CallRecordingType.none)
-    }
-}

package/native-bridge/iOS/Source/DTOs/KaleyraVideoConfiguration+Bandyer.swift

@@ -1,158 +0,0 @@
-// Copyright © 2018-2023 Kaleyra S.p.a. All Rights Reserved.
-// See LICENSE for licensing information
-
-import Foundation
-import UIKit
-import Bandyer
-import PushKit
-
-@available(iOS 12.0, *)
-extension KaleyraVideoConfiguration {
-
-    private enum ConfigurationError: Error {
-        case unsupportedEnvironment
-        case unsupportedRegion
-    }
-
-    var isCallkitEnabled: Bool {
-        iosConfig?.callkit?.enabled ?? true
-    }
-
-    var voipStrategy: VoipHandlingStrategy {
-        iosConfig?.voipHandlingStrategy ?? .automatic
-    }
-
-    func makeBandyerConfig(registryDelegate: PKPushRegistryDelegate? = nil) throws -> Bandyer.Config {
-        guard let bandyerEnv = environment.bandyerEnvironment else {
-            throw ConfigurationError.unsupportedEnvironment
-        }
-
-        guard let bandyerRegion = region.bandyerRegion else {
-            throw ConfigurationError.unsupportedRegion
-        }
-
-        return try ConfigBuilder(appID: appID, environment: bandyerEnv, region: bandyerRegion)
-            .callKit(iosConfig.makeCallkitConfigurationBuilder())
-            .tools(tools.makeToolsConfigurationBuilder())
-            .voip(iosConfig.makeVoipConfigurationBuilder(registryDelegate: registryDelegate))
-            .build()
-    }
-}
-
-@available(iOS 12.0, *)
-private extension Optional where Wrapped == IosConfiguration {
-
-    func makeCallkitConfigurationBuilder() -> CallKitConfigurationBuilder {
-        switch self {
-            case .none:
-                let builder = CallKitConfigurationBuilder()
-                builder.enabled()
-                return builder
-            case .some(let wrapped):
-                return wrapped.makeCallkitConfigurationBuilder()
-        }
-    }
-
-    func makeVoipConfigurationBuilder(registryDelegate: PKPushRegistryDelegate?) -> VoIPPushConfigurationBuilder {
-        switch self {
-            case .none:
-                let builder = VoIPPushConfigurationBuilder()
-                builder.manual()
-                return builder
-            case .some(let wrapped):
-                return wrapped.makeVoipConfigurationBuilder(registryDelegate: registryDelegate)
-        }
-    }
-}
-
-@available(iOS 12.0, *)
-private extension Optional where Wrapped == Tools {
-
-    func makeToolsConfigurationBuilder() -> ToolsConfigurationBuilder {
-        switch self {
-            case .none:
-                return ToolsConfigurationBuilder()
-            case .some(let wrapped):
-                return wrapped.makeToolsConfigurationBuilder()
-        }
-    }
-}
-
-@available(iOS 12.0, *)
-private extension IosConfiguration {
-
-    func makeCallkitConfigurationBuilder() -> CallKitConfigurationBuilder {
-        let builder = CallKitConfigurationBuilder()
-
-        guard let callkitConfig = callkit else {
-            builder.enabled()
-            return builder
-        }
-
-        if callkitConfig.enabled ?? true {
-            builder.enabled { providerConf in
-                if let iconName = callkitConfig.appIconName,
-                   let image = UIImage(named: iconName) {
-                    providerConf.icon(image)
-                }
-                if let ringtone = callkitConfig.ringtoneSoundName {
-                    providerConf.ringtoneSound(ringtone)
-                }
-            }
-        } else {
-            builder.disabled()
-        }
-        return builder
-    }
-
-    func makeVoipConfigurationBuilder(registryDelegate: PKPushRegistryDelegate?) -> VoIPPushConfigurationBuilder {
-        let builder = VoIPPushConfigurationBuilder()
-
-        if (voipHandlingStrategy == nil || voipHandlingStrategy == .automatic),
-            let delegate = registryDelegate {
-            builder.automatic(pushRegistryDelegate: delegate)
-        } else {
-            builder.manual()
-        }
-
-        return builder
-    }
-}
-
-@available(iOS 12.0, *)
-private extension Tools {
-
-    func makeToolsConfigurationBuilder() -> ToolsConfigurationBuilder {
-        let builder = ToolsConfigurationBuilder()
-
-        if chat != nil {
-            builder.chat()
-        }
-
-        if fileShare ?? false {
-            builder.fileshare()
-        }
-
-        if whiteboard ?? false {
-            builder.whiteboard(uploadEnabled: true)
-        }
-
-        if let screenshare = screenShare {
-            if screenshare.inApp ?? false {
-                builder.inAppScreenSharing()
-            }
-
-            if screenshare.wholeDevice ?? false {
-                if let configURL = Bundle.main.url(forResource: "KaleyraVideoConfig", withExtension: "plist") {
-                    let reader = BroadcastConfigurationPlistReader()
-                    if let broadcastConfig = try? reader.read(fileURL: configURL) {
-                        builder.broadcastScreenSharing(appGroupIdentifier: broadcastConfig.appGroupID,
-                                                       broadcastExtensionBundleIdentifier: broadcastConfig.extensionBundleID)
-                    }
-                }
-            }
-        }
-
-        return builder
-    }
-}