From 233ad5e86cd20647f642a820520b376f4fe0d3fe Mon Sep 17 00:00:00 2001 From: Antoine Veuiller Date: Thu, 15 Feb 2018 17:37:28 +0100 Subject: [PATCH] feat: add stings-google-services dependency for APISENSE Configure integration for google places --- bee/build.gradle | 1 + bee/proguard-rules.pro | 3 +++ bee/src/main/AndroidManifest.xml | 4 ++++ .../main/java/com/apisense/bee/BeeApplication.java | 14 ++++++++------ bee/src/main/res/values/strings.xml | 1 + 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bee/build.gradle b/bee/build.gradle index 23f314d..d9ed8cb 100644 --- a/bee/build.gradle +++ b/bee/build.gradle @@ -110,6 +110,7 @@ dependencies { implementation 'io.apisense.sdk:stings-motion:' + apisenseVersion implementation 'io.apisense.sdk:stings-environment:' + apisenseVersion implementation 'io.apisense.sdk:stings-visualization:' + apisenseVersion + implementation 'io.apisense.sdk:stings-google-services:' + apisenseVersion experimentalImplementation('io.apisense:netsense:1.0.0') diff --git a/bee/proguard-rules.pro b/bee/proguard-rules.pro index 181f918..5c78c2f 100644 --- a/bee/proguard-rules.pro +++ b/bee/proguard-rules.pro @@ -69,6 +69,9 @@ # Dagger: https://github.com/google/dagger/issues/645 -dontwarn com.google.errorprone.annotations.* +# Places sting +-keepclassmembers class com.google.android.gms.location.places.Place { *; } + # End apisense ############## diff --git a/bee/src/main/AndroidManifest.xml b/bee/src/main/AndroidManifest.xml index adb662b..e906fef 100644 --- a/bee/src/main/AndroidManifest.xml +++ b/bee/src/main/AndroidManifest.xml @@ -62,6 +62,10 @@ android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> + + diff --git a/bee/src/main/java/com/apisense/bee/BeeApplication.java b/bee/src/main/java/com/apisense/bee/BeeApplication.java index 17821f7..16d1f47 100644 --- a/bee/src/main/java/com/apisense/bee/BeeApplication.java +++ b/bee/src/main/java/com/apisense/bee/BeeApplication.java @@ -20,6 +20,7 @@ import io.apisense.sdk.APISENSE; import io.apisense.sdk.APSApplication; import io.apisense.sting.environment.EnvironmentStingModule; +import io.apisense.sting.googleservices.GoogleServicesStingModule; import io.apisense.sting.motion.MotionStingModule; import io.apisense.sting.network.NetworkStingModule; import io.apisense.sting.phone.PhoneStingModule; @@ -45,11 +46,11 @@ public class BeeApplication extends APSApplication { deviceMap.put("os", Build.VERSION.BASE_OS); } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - Sender sender = new SyncSender.Builder().accessToken(BuildConfig.ROLLBAR_KEY).build(); - // Rollbar doesn't seems to upload errors with only a SyncSender. - Sender buffSender = new BufferedSender.Builder().sender(sender).build(); - rollbar = Rollbar.init( + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + Sender sender = new SyncSender.Builder().accessToken(BuildConfig.ROLLBAR_KEY).build(); + // Rollbar doesn't seems to upload errors with only a SyncSender. + Sender buffSender = new BufferedSender.Builder().sender(sender).build(); + rollbar = Rollbar.init( ConfigBuilder.withAccessToken(BuildConfig.ROLLBAR_KEY) .environment(BuildConfig.ROLLBAR_ENV) .framework("Android") @@ -87,7 +88,8 @@ protected APISENSE.Sdk generateAPISENSESdk() { new NetworkStingModule(), new MotionStingModule(), new EnvironmentStingModule(), - new VisualizationStingModule() + new VisualizationStingModule(), + new GoogleServicesStingModule() ) .useScriptExecutionService(true); diff --git a/bee/src/main/res/values/strings.xml b/bee/src/main/res/values/strings.xml index a25ba59..7d4ae67 100644 --- a/bee/src/main/res/values/strings.xml +++ b/bee/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ 380173086743-qasd4ru2o2jnblbugg6vkj2em6d2uih1.apps.googleusercontent.com 1760322360873183 fb1760322360873183 + AIzaSyBrZsS2athB3s4LGWpQdxh7yvSYHI5R3NI CgkIl-DToIgLEAIQAQ CgkIl-DToIgLEAIQBg