Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions ios/Classes/SwiftQonversionPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions lib/src/dto/user_property_key.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ enum QUserPropertyKey {
appMetricaUserProfileId,
pushWooshHwId,
pushWooshUserId,
tenjinAnalyticsInstallationId,
custom,
}
2 changes: 2 additions & 0 deletions lib/src/internal/mapper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down