@amplitude/analytics-react-native 1.2.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/main/java/com/amplitude/reactnative/AmplitudeReactNativeModule.kt +18 -12
- package/android/src/main/java/com/amplitude/reactnative/AndroidContextProvider.kt +12 -6
- package/ios/AmplitudeReactNative.m +1 -1
- package/ios/AmplitudeReactNative.swift +2 -1
- package/lib/commonjs/plugins/context.js +1 -1
- package/lib/commonjs/plugins/context.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/plugins/context.js +1 -1
- package/lib/module/plugins/context.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/plugins/context.d.ts +1 -1
- package/lib/typescript/plugins/context.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/plugins/context.ts +2 -2
- package/src/version.ts +1 -1
|
@@ -13,25 +13,31 @@ const val MODULE_NAME = "AmplitudeReactNative"
|
|
|
13
13
|
@ReactModule(name = MODULE_NAME)
|
|
14
14
|
class AmplitudeReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
|
|
15
15
|
|
|
16
|
-
private
|
|
16
|
+
private var androidContextProvider: AndroidContextProvider? = null
|
|
17
17
|
|
|
18
18
|
override fun getName(): String {
|
|
19
19
|
return MODULE_NAME
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
@ReactMethod
|
|
23
|
-
private fun getApplicationContext(promise: Promise) {
|
|
23
|
+
private fun getApplicationContext(shouldTrackAdid: Boolean, promise: Promise) {
|
|
24
|
+
if (androidContextProvider == null) {
|
|
25
|
+
androidContextProvider = AndroidContextProvider(reactContext.applicationContext, false, shouldTrackAdid)
|
|
26
|
+
}
|
|
27
|
+
|
|
24
28
|
promise.resolve(WritableNativeMap().apply {
|
|
25
|
-
putString("version", androidContextProvider
|
|
26
|
-
putString("platform", androidContextProvider
|
|
27
|
-
putString("language", androidContextProvider
|
|
28
|
-
putString("osName", androidContextProvider
|
|
29
|
-
putString("osVersion", androidContextProvider
|
|
30
|
-
putString("deviceBrand", androidContextProvider
|
|
31
|
-
putString("deviceManufacturer", androidContextProvider
|
|
32
|
-
putString("deviceModel", androidContextProvider
|
|
33
|
-
putString("carrier", androidContextProvider
|
|
34
|
-
|
|
29
|
+
putString("version", androidContextProvider!!.versionName)
|
|
30
|
+
putString("platform", androidContextProvider!!.platform)
|
|
31
|
+
putString("language", androidContextProvider!!.language)
|
|
32
|
+
putString("osName", androidContextProvider!!.osName)
|
|
33
|
+
putString("osVersion", androidContextProvider!!.osVersion)
|
|
34
|
+
putString("deviceBrand", androidContextProvider!!.brand)
|
|
35
|
+
putString("deviceManufacturer", androidContextProvider!!.manufacturer)
|
|
36
|
+
putString("deviceModel", androidContextProvider!!.model)
|
|
37
|
+
putString("carrier", androidContextProvider!!.carrier)
|
|
38
|
+
if (androidContextProvider!!.advertisingId != null) {
|
|
39
|
+
putString("adid", androidContextProvider!!.advertisingId)
|
|
40
|
+
}
|
|
35
41
|
})
|
|
36
42
|
}
|
|
37
43
|
}
|
|
@@ -20,8 +20,9 @@ import java.util.Locale
|
|
|
20
20
|
import java.util.UUID
|
|
21
21
|
import kotlin.collections.ArrayList
|
|
22
22
|
|
|
23
|
-
class AndroidContextProvider(private val context: Context, locationListening: Boolean) {
|
|
23
|
+
class AndroidContextProvider(private val context: Context, locationListening: Boolean, shouldTrackAdid: Boolean) {
|
|
24
24
|
var isLocationListening = true
|
|
25
|
+
var shouldTrackAdid = true
|
|
25
26
|
private var cachedInfo: CachedInfo? = null
|
|
26
27
|
private get() {
|
|
27
28
|
if (field == null) {
|
|
@@ -34,7 +35,7 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
|
|
|
34
35
|
* Internal class serves as a cache
|
|
35
36
|
*/
|
|
36
37
|
inner class CachedInfo {
|
|
37
|
-
var advertisingId: String
|
|
38
|
+
var advertisingId: String?
|
|
38
39
|
val country: String?
|
|
39
40
|
val versionName: String?
|
|
40
41
|
val osName: String
|
|
@@ -201,7 +202,11 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
|
|
|
201
202
|
return locale.language
|
|
202
203
|
}
|
|
203
204
|
|
|
204
|
-
private fun fetchAdvertisingId(): String {
|
|
205
|
+
private fun fetchAdvertisingId(): String? {
|
|
206
|
+
if (!shouldTrackAdid) {
|
|
207
|
+
return null
|
|
208
|
+
}
|
|
209
|
+
|
|
205
210
|
// This should not be called on the main thread.
|
|
206
211
|
return if ("Amazon" == fetchManufacturer()) {
|
|
207
212
|
fetchAndCacheAmazonAdvertisingId
|
|
@@ -237,14 +242,14 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
|
|
|
237
242
|
return appSetId
|
|
238
243
|
}
|
|
239
244
|
|
|
240
|
-
private val fetchAndCacheAmazonAdvertisingId: String
|
|
245
|
+
private val fetchAndCacheAmazonAdvertisingId: String?
|
|
241
246
|
private get() {
|
|
242
247
|
val cr = context.contentResolver
|
|
243
248
|
limitAdTrackingEnabled = Secure.getInt(cr, SETTING_LIMIT_AD_TRACKING, 0) == 1
|
|
244
249
|
advertisingId = Secure.getString(cr, SETTING_ADVERTISING_ID)
|
|
245
250
|
return advertisingId
|
|
246
251
|
}
|
|
247
|
-
private val fetchAndCacheGoogleAdvertisingId: String
|
|
252
|
+
private val fetchAndCacheGoogleAdvertisingId: String?
|
|
248
253
|
private get() {
|
|
249
254
|
try {
|
|
250
255
|
val AdvertisingIdClient = Class
|
|
@@ -340,7 +345,7 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
|
|
|
340
345
|
get() = cachedInfo!!.country
|
|
341
346
|
val language: String
|
|
342
347
|
get() = cachedInfo!!.language
|
|
343
|
-
val advertisingId: String
|
|
348
|
+
val advertisingId: String?
|
|
344
349
|
get() = cachedInfo!!.advertisingId
|
|
345
350
|
val appSetId: String
|
|
346
351
|
get() = cachedInfo!!.appSetId // other causes// failed to get providers list
|
|
@@ -416,5 +421,6 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
|
|
|
416
421
|
|
|
417
422
|
init {
|
|
418
423
|
isLocationListening = locationListening
|
|
424
|
+
this.shouldTrackAdid = shouldTrackAdid
|
|
419
425
|
}
|
|
420
426
|
}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
@interface RCT_EXTERN_MODULE(AmplitudeReactNative, NSObject)
|
|
4
4
|
|
|
5
|
-
RCT_EXTERN_METHOD(getApplicationContext: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
|
|
5
|
+
RCT_EXTERN_METHOD(getApplicationContext: (BOOL)shouldTrackAdid resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
|
|
6
6
|
|
|
7
7
|
@end
|
|
@@ -13,7 +13,8 @@ class ReactNative: NSObject {
|
|
|
13
13
|
|
|
14
14
|
@objc
|
|
15
15
|
func getApplicationContext(
|
|
16
|
-
_
|
|
16
|
+
_ shouldTrackAdid: Bool,
|
|
17
|
+
resolver resolve: RCTPromiseResolveBlock,
|
|
17
18
|
rejecter reject: RCTPromiseRejectBlock
|
|
18
19
|
) -> Void {
|
|
19
20
|
let applicationContext: [String: String?] = [
|
|
@@ -42,7 +42,7 @@ class Context {
|
|
|
42
42
|
async execute(context) {
|
|
43
43
|
var _this$nativeModule;
|
|
44
44
|
const time = new Date().getTime();
|
|
45
|
-
const nativeContext = await ((_this$nativeModule = this.nativeModule) === null || _this$nativeModule === void 0 ? void 0 : _this$nativeModule.getApplicationContext());
|
|
45
|
+
const nativeContext = await ((_this$nativeModule = this.nativeModule) === null || _this$nativeModule === void 0 ? void 0 : _this$nativeModule.getApplicationContext(this.config.trackingOptions.adid ?? false));
|
|
46
46
|
const appVersion = (nativeContext === null || nativeContext === void 0 ? void 0 : nativeContext.version) || this.config.appVersion;
|
|
47
47
|
const platform = (nativeContext === null || nativeContext === void 0 ? void 0 : nativeContext.platform) || BROWSER_PLATFORM;
|
|
48
48
|
const osName = (nativeContext === null || nativeContext === void 0 ? void 0 : nativeContext.osName) || this.uaResult.browser.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BROWSER_PLATFORM","IP_ADDRESS","Context","constructor","PluginType","BEFORE","NativeModules","AmplitudeReactNative","VERSION","agent","navigator","userAgent","uaResult","UAParser","getResult","setup","config","Promise","resolve","undefined","execute","context","time","Date","getTime","nativeContext","nativeModule","getApplicationContext","appVersion","version","platform","osName","browser","name","osVersion","deviceVendor","deviceManufacturer","device","vendor","deviceModel","model","os","language","getLanguage","carrier","
|
|
1
|
+
{"version":3,"names":["BROWSER_PLATFORM","IP_ADDRESS","Context","constructor","PluginType","BEFORE","NativeModules","AmplitudeReactNative","VERSION","agent","navigator","userAgent","uaResult","UAParser","getResult","setup","config","Promise","resolve","undefined","execute","context","time","Date","getTime","nativeContext","nativeModule","getApplicationContext","trackingOptions","adid","appVersion","version","platform","osName","browser","name","osVersion","deviceVendor","deviceManufacturer","device","vendor","deviceModel","model","os","language","getLanguage","carrier","event","user_id","userId","device_id","deviceId","session_id","sessionId","app_version","os_name","os_version","device_manufacturer","device_model","ipAddress","ip","insert_id","UUID","partner_id","partnerId","plan","ingestionMetadata","ingestion_metadata","source_name","sourceName","source_version","sourceVersion","library"],"sourceRoot":"../../src","sources":["context.ts"],"mappings":"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"}
|
package/lib/commonjs/version.js
CHANGED
|
@@ -35,7 +35,7 @@ export class Context {
|
|
|
35
35
|
async execute(context) {
|
|
36
36
|
var _this$nativeModule;
|
|
37
37
|
const time = new Date().getTime();
|
|
38
|
-
const nativeContext = await ((_this$nativeModule = this.nativeModule) === null || _this$nativeModule === void 0 ? void 0 : _this$nativeModule.getApplicationContext());
|
|
38
|
+
const nativeContext = await ((_this$nativeModule = this.nativeModule) === null || _this$nativeModule === void 0 ? void 0 : _this$nativeModule.getApplicationContext(this.config.trackingOptions.adid ?? false));
|
|
39
39
|
const appVersion = (nativeContext === null || nativeContext === void 0 ? void 0 : nativeContext.version) || this.config.appVersion;
|
|
40
40
|
const platform = (nativeContext === null || nativeContext === void 0 ? void 0 : nativeContext.platform) || BROWSER_PLATFORM;
|
|
41
41
|
const osName = (nativeContext === null || nativeContext === void 0 ? void 0 : nativeContext.osName) || this.uaResult.browser.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PluginType","UAParser","UUID","getLanguage","VERSION","NativeModules","BROWSER_PLATFORM","IP_ADDRESS","Context","constructor","BEFORE","AmplitudeReactNative","agent","navigator","userAgent","uaResult","getResult","setup","config","Promise","resolve","undefined","execute","context","time","Date","getTime","nativeContext","nativeModule","getApplicationContext","appVersion","version","platform","osName","browser","name","osVersion","deviceVendor","deviceManufacturer","device","vendor","deviceModel","model","os","language","carrier","
|
|
1
|
+
{"version":3,"names":["PluginType","UAParser","UUID","getLanguage","VERSION","NativeModules","BROWSER_PLATFORM","IP_ADDRESS","Context","constructor","BEFORE","AmplitudeReactNative","agent","navigator","userAgent","uaResult","getResult","setup","config","Promise","resolve","undefined","execute","context","time","Date","getTime","nativeContext","nativeModule","getApplicationContext","trackingOptions","adid","appVersion","version","platform","osName","browser","name","osVersion","deviceVendor","deviceManufacturer","device","vendor","deviceModel","model","os","language","carrier","event","user_id","userId","device_id","deviceId","session_id","sessionId","app_version","os_name","os_version","device_manufacturer","device_model","ipAddress","ip","insert_id","partner_id","partnerId","plan","ingestionMetadata","ingestion_metadata","source_name","sourceName","source_version","sourceVersion","library"],"sourceRoot":"../../src","sources":["context.ts"],"mappings":"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"}
|
package/lib/module/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '1.2.
|
|
1
|
+
export const VERSION = '1.2.1';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -13,7 +13,7 @@ type NativeContext = {
|
|
|
13
13
|
adid: string;
|
|
14
14
|
};
|
|
15
15
|
export interface AmplitudeReactNative {
|
|
16
|
-
getApplicationContext(): Promise<NativeContext>;
|
|
16
|
+
getApplicationContext(shouldTrackAdid: boolean): Promise<NativeContext>;
|
|
17
17
|
}
|
|
18
18
|
export declare class Context implements BeforePlugin {
|
|
19
19
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/plugins/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAChG,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAS/C,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/plugins/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAChG,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAS/C,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,qBAAqB,CAAC,eAAe,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACzE;AAED,qBAAa,OAAQ,YAAW,YAAY;IAC1C,IAAI,SAAa;IACjB,IAAI,oBAA8B;IAKlC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC3B,YAAY,EAAE,oBAAoB,GAAG,SAAS,CAEhC;IACd,OAAO,SAA0C;;IAWjD,KAAK,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;IAK9C,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CA0C9C"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "1.2.
|
|
1
|
+
export declare const VERSION = "1.2.1";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@amplitude/analytics-react-native",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"description": "Official React Native SDK",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"analytics",
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
]
|
|
90
90
|
]
|
|
91
91
|
},
|
|
92
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "477399777aebd9a1a0a00dc0e11504399d0a4031"
|
|
93
93
|
}
|
package/src/plugins/context.ts
CHANGED
|
@@ -22,7 +22,7 @@ type NativeContext = {
|
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
export interface AmplitudeReactNative {
|
|
25
|
-
getApplicationContext(): Promise<NativeContext>;
|
|
25
|
+
getApplicationContext(shouldTrackAdid: boolean): Promise<NativeContext>;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
export class Context implements BeforePlugin {
|
|
@@ -55,7 +55,7 @@ export class Context implements BeforePlugin {
|
|
|
55
55
|
|
|
56
56
|
async execute(context: Event): Promise<Event> {
|
|
57
57
|
const time = new Date().getTime();
|
|
58
|
-
const nativeContext = await this.nativeModule?.getApplicationContext();
|
|
58
|
+
const nativeContext = await this.nativeModule?.getApplicationContext(this.config.trackingOptions.adid ?? false);
|
|
59
59
|
const appVersion = nativeContext?.version || this.config.appVersion;
|
|
60
60
|
const platform = nativeContext?.platform || BROWSER_PLATFORM;
|
|
61
61
|
const osName = nativeContext?.osName || this.uaResult.browser.name;
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = '1.2.
|
|
1
|
+
export const VERSION = '1.2.1';
|