diff options
| author | Stefanos Togoulidis <stefanostogoulidis@gmail.com> | 2016-10-03 14:43:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 14:43:03 +0300 |
| commit | 4c800f8f8c4218994c48795323546db511e563cd (patch) | |
| tree | 335e35cfbae2cceaa6ec9b6bfd5e157399dc7f2e | |
| parent | 1d11fa7c5038a3abbdd59846d670ac7f2ad90884 (diff) | |
| parent | 6b947a20d811e3693c4418b1138a4874e6162c1b (diff) | |
| download | gradle-perf-android-medium-4c800f8f8c4218994c48795323546db511e563cd.tar.gz | |
Merge pull request #4592 from wordpress-mobile/issue/4450-helpshift-update-to-4.7.0
Fixes #4450: helpshift update to 4.7.0
| -rw-r--r-- | WordPress/build.gradle | 2 | ||||
| -rw-r--r-- | WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 0d435f8f2..3768fbd79 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -98,7 +98,7 @@ dependencies { compile 'com.google.android.gms:play-services-gcm:9.0.2' compile 'com.google.android.gms:play-services-auth:9.0.2' compile 'com.github.chrisbanes.photoview:library:1.2.4' - compile 'com.helpshift:android-helpshift-aar:4.4.0' + compile 'com.helpshift:android-helpshift-aar:4.7.0' compile 'de.greenrobot:eventbus:2.4.0' compile 'com.automattic:rest:1.0.7' compile 'org.wordpress:graphview:3.4.0' diff --git a/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java b/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java index cc0bc3262..baf95bc1b 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java +++ b/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java @@ -7,6 +7,8 @@ import android.content.Intent; import android.text.TextUtils; import com.helpshift.Core; +import com.helpshift.InstallConfig; +import com.helpshift.exceptions.InstallException; import com.helpshift.support.Support; import com.helpshift.support.Support.Delegate; @@ -16,6 +18,7 @@ import org.wordpress.android.WordPress; import org.wordpress.android.analytics.AnalyticsTracker; import org.wordpress.android.analytics.AnalyticsTracker.Stat; import org.wordpress.android.models.AccountHelper; +import org.wordpress.android.util.AppLog.T; import java.io.File; import java.util.HashMap; @@ -84,11 +87,16 @@ public class HelpshiftHelper { } public static void init(Application application) { - HashMap<String, Boolean> config = new HashMap<String, Boolean>(); - config.put("enableInAppNotification", false); + InstallConfig installConfig = new InstallConfig.Builder() + .setEnableInAppNotification(true) + .build(); Core.init(Support.getInstance()); - Core.install(application, BuildConfig.HELPSHIFT_API_KEY, BuildConfig.HELPSHIFT_API_DOMAIN, - BuildConfig.HELPSHIFT_API_ID, config); + try { + Core.install(application, BuildConfig.HELPSHIFT_API_KEY, BuildConfig.HELPSHIFT_API_DOMAIN, + BuildConfig.HELPSHIFT_API_ID, installConfig); + } catch (InstallException e) { + AppLog.e(T.UTILS, e); + } Support.setDelegate(new Delegate() { @Override public void sessionBegan() { |