Skip to content

Commit eabd24e

Browse files
authored
Merge pull request #363 from qonversion/feature/sc-35316/tenjin
Tenjin integration
2 parents 329cf6c + fd8ea44 commit eabd24e

File tree

4 files changed

+13
-30
lines changed

4 files changed

+13
-30
lines changed

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -267,34 +267,14 @@
267267
);
268268
inputPaths = (
269269
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
270-
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
271-
"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
272-
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
273-
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
274-
"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
275-
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
276-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
277-
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
278270
"${BUILT_PRODUCTS_DIR}/Qonversion/Qonversion.framework",
279271
"${BUILT_PRODUCTS_DIR}/QonversionSandwich/QonversionSandwich.framework",
280-
"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
281-
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
282272
"${BUILT_PRODUCTS_DIR}/qonversion_flutter/qonversion_flutter.framework",
283273
);
284274
name = "[CP] Embed Pods Frameworks";
285275
outputPaths = (
286-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
287-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
288-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
289-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
290-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
291-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
292-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
293-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
294276
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qonversion.framework",
295277
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QonversionSandwich.framework",
296-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",
297-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
298278
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/qonversion_flutter.framework",
299279
);
300280
runOnlyForDeploymentPostprocessing = 0;

ios/Classes/SwiftQonversionPlugin.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -319,20 +319,20 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
319319
}
320320

321321
private func attachUserToRemoteConfiguration(_ args: [String: Any], _ result: @escaping FlutterResult) {
322-
guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else {
323-
return result(FlutterError.noNecessaryData)
324-
}
325-
326-
qonversionSandwich?.attachUserToRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result))
322+
guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else {
323+
return result(FlutterError.noNecessaryData)
327324
}
328325

329-
private func detachUserFromRemoteConfiguration(_ args: [String: Any], _ result: @escaping FlutterResult) {
330-
guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else {
331-
return result(FlutterError.noNecessaryData)
332-
}
326+
qonversionSandwich?.attachUserToRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result))
327+
}
333328

334-
qonversionSandwich?.detachUserFromRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result))
329+
private func detachUserFromRemoteConfiguration(_ args: [String: Any], _ result: @escaping FlutterResult) {
330+
guard let remoteConfigurationId = args["remoteConfigurationId"] as? String else {
331+
return result(FlutterError.noNecessaryData)
335332
}
333+
334+
qonversionSandwich?.detachUserFromRemoteConfiguration(with: remoteConfigurationId, completion: getJsonCompletion(result))
335+
}
336336

337337
private func storeSdkInfo(_ args: [String: Any], _ result: @escaping FlutterResult) {
338338
guard let version = args["version"] as? String,

lib/src/dto/user_property_key.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ enum QUserPropertyKey {
1313
appMetricaUserProfileId,
1414
pushWooshHwId,
1515
pushWooshUserId,
16+
tenjinAnalyticsInstallationId,
1617
custom,
1718
}

lib/src/internal/mapper.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ class QMapper {
119119
return QUserPropertyKey.pushWooshHwId;
120120
case "_q_pushwoosh_user_id":
121121
return QUserPropertyKey.pushWooshUserId;
122+
case "_q_tenjin_aiid":
123+
return QUserPropertyKey.tenjinAnalyticsInstallationId;
122124
}
123125

124126
return QUserPropertyKey.custom;

0 commit comments

Comments
 (0)