AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] flurry sdk update, add mopub activity to manifest, audience network sdk update

Browse source
This commit is contained in:
Dmitry Donskoy 2018-05-25 17:01:12 +03:00 • committed by yoksnod
parent f97c094829
commit add49d12f4
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/AndroidManifest.xml
View file

@ -11,7 +11,8 @@
with our version (15 API), that's why forcible use our version to resolve this conflict -->
<uses-sdk tools:overrideLibrary="com.mopub.mobileads.native_static,
com.mopub.mobileads.base,
com.moat.analytics.mobile.mpub"/>
com.moat.analytics.mobile.mpub,
com.flurry.android.analytics.sdk"/>
<uses-feature
android:glEsVersion="0x00020000"
@ -422,6 +423,8 @@
android:configChanges="orientation|screenLayout|screenSize"
android:label="@string/booking_filters"/>
<activity android:name="com.mopub.common.privacy.ConsentDialogActivity"
android:configChanges="keyboardHidden|orientation|screenSize"/>
<receiver
android:name="com.mapswithme.maps.background.ConnectivityChangedReceiver"
android:enabled="true"

4
android/build.gradle
View file

@ -58,7 +58,7 @@ dependencies {
implementation 'com.google.android.gms:play-services-ads:11.8.0'
implementation 'com.google.android.gms:play-services-auth:11.8.0'
// statistics
implementation 'com.flurry.android:analytics:6.7.0'
implementation 'com.flurry.android:analytics:11.0.0@aar'
// crash reporting
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') { transitive = true }
implementation('com.crashlytics.sdk.android:crashlytics-ndk:2.0.0@aar') { transitive = true }
@ -67,7 +67,7 @@ dependencies {
exclude group: 'com.google.android.gms'
exclude group: 'com.android.support'
}
implementation('com.facebook.android:audience-network-sdk:4.26.0') {
implementation('com.facebook.android:audience-network-sdk:4.27.0') {
exclude group: 'com.google.android.gms'
exclude group: 'com.android.support'
}

12
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -37,6 +37,8 @@ import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import com.mapswithme.util.statistics.PushwooshHelper;
import com.mapswithme.util.statistics.Statistics;
import com.mopub.common.MoPub;
import com.mopub.common.SdkConfiguration;
import com.my.tracker.MyTracker;
import com.my.tracker.MyTrackerParams;
import com.pushwoosh.PushManager;
@ -167,6 +169,7 @@ public class MwmApplication extends Application
private void initCoreIndependentSdks()
{
initMoPub();
initCrashlytics();
initLibnotify();
initPushWoosh();
@ -174,6 +177,15 @@ public class MwmApplication extends Application
initTracker();
}
private void initMoPub()
{
SdkConfiguration sdkConfiguration = new SdkConfiguration
.Builder("")
.build();
MoPub.initializeSdk(this, sdkConfiguration, null);
}
/**
* Initialize native core of application: platform and framework. Caller must handle returned value
* and do nothing with native code if initialization is failed.

9
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -454,10 +454,13 @@ public enum Statistics
if (mEnabled)
{
//noinspection ConstantConditions
FlurryAgent.setLogLevel(BuildConfig.DEBUG ? Log.DEBUG : Log.ERROR);
FlurryAgent.setVersionName(BuildConfig.VERSION_NAME);
FlurryAgent.setCaptureUncaughtExceptions(false);
FlurryAgent.init(context, PrivateVariables.flurryKey());
new FlurryAgent
.Builder()
.withLogEnabled(true)
.withLogLevel(BuildConfig.DEBUG ? Log.DEBUG : Log.ERROR)
.withCaptureUncaughtExceptions(false)
.build(context, PrivateVariables.flurryKey());
}
// At the moment, need to always initialize engine for correct JNI http part reusing.
// Statistics is still enabled/disabled separately and never sent anywhere if turned off.