diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index cf975eb..4ee676f 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -267,34 +267,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework", - "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/Qonversion/Qonversion.framework", "${BUILT_PRODUCTS_DIR}/QonversionSandwich/QonversionSandwich.framework", - "${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", "${BUILT_PRODUCTS_DIR}/qonversion_flutter/qonversion_flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qonversion.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QonversionSandwich.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/qonversion_flutter.framework", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/Classes/SwiftQonversionPlugin.swift b/ios/Classes/SwiftQonversionPlugin.swift index 1f99706..d3459de 100644 --- a/ios/Classes/SwiftQonversionPlugin.swift +++ b/ios/Classes/SwiftQonversionPlugin.swift @@ -319,20 +319,20 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin { } private func attachUserToRemoteConfiguration(_ args: [String: Any], _ result: @escaping FlutterResult) { - guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else { - return result(FlutterError.noNecessaryData) - } - - qonversionSandwich?.attachUserToRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result)) + guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else { + return result(FlutterError.noNecessaryData) } - private func detachUserFromRemoteConfiguration(_ args: [String: Any], _ result: @escaping FlutterResult) { - guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else { - return result(FlutterError.noNecessaryData) - } + qonversionSandwich?.attachUserToRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result)) + } - qonversionSandwich?.detachUserFromRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result)) + private func detachUserFromRemoteConfiguration(_ args: [String: Any], _ result: @escaping FlutterResult) { + guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else { + return result(FlutterError.noNecessaryData) } + + qonversionSandwich?.detachUserFromRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result)) + } private func storeSdkInfo(_ args: [String: Any], _ result: @escaping FlutterResult) { guard let version = args["version"] as? String, diff --git a/lib/src/dto/user_property_key.dart b/lib/src/dto/user_property_key.dart index d5e7a89..ac142d7 100644 --- a/lib/src/dto/user_property_key.dart +++ b/lib/src/dto/user_property_key.dart @@ -13,5 +13,6 @@ enum QUserPropertyKey { appMetricaUserProfileId, pushWooshHwId, pushWooshUserId, + tenjinAnalyticsInstallationId, custom, } diff --git a/lib/src/internal/mapper.dart b/lib/src/internal/mapper.dart index 1346547..d04506c 100644 --- a/lib/src/internal/mapper.dart +++ b/lib/src/internal/mapper.dart @@ -119,6 +119,8 @@ class QMapper { return QUserPropertyKey.pushWooshHwId; case "_q_pushwoosh_user_id": return QUserPropertyKey.pushWooshUserId; + case "_q_tenjin_aiid": + return QUserPropertyKey.tenjinAnalyticsInstallationId; } return QUserPropertyKey.custom;