1
0
Fork 0

For #1298: Fixes issue with Adjust campaign not sending through Glean (#5896)

master
Sawyer Blatz 2019-10-29 10:09:07 -07:00 committed by GitHub
parent 7813fb22d4
commit 2a358db561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 7 deletions

View File

@ -415,7 +415,8 @@ metrics:
type: string
lifetime: application
description: >
A string containing the Adjust campaign ID from which the user installed Fenix
A string containing the Adjust campaign ID from which the user installed Fenix. This will not
send on the first session the user runs. If the install is organic, this will be empty.
send_in_pings:
- metrics
bugs:

View File

@ -94,3 +94,17 @@
# Keep motionlayout internal methods
# https://github.com/mozilla-mobile/fenix/issues/2094
-keep class androidx.constraintlayout.** { *; }
# Keep adjust relevant classes
-keep class com.adjust.sdk.** { *; }
-keep class com.google.android.gms.common.ConnectionResult {
int SUCCESS;
}
-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
}
-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
java.lang.String getId();
boolean isLimitAdTrackingEnabled();
}
-keep public class com.android.installreferrer.** { *; }

View File

@ -4,6 +4,7 @@
package="org.mozilla.fenix">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

View File

@ -35,13 +35,10 @@ class AdjustMetricsService(private val application: Application) : MetricsServic
)
config.setOnAttributionChangedListener {
it.campaign?.let { campaign ->
application.settings().adjustCampaignId = campaign
}
application.applicationContext.settings().adjustCampaignId = it.campaign
}
config.setLogLevel(LogLevel.SUPRESS)
Adjust.onCreate(config)
Adjust.setEnabled(true)
application.registerActivityLifecycleCallbacks(AdjustLifecycleCallbacks())

View File

@ -47,7 +47,7 @@ object Versions {
const val mozilla_glean = "19.0.0"
const val autodispose = "1.1.0"
const val adjust = "4.11.4"
const val adjust = "4.18.3"
const val installreferrer = "1.0"
const val junit = "4.12"

File diff suppressed because one or more lines are too long