Merge branch 'dev'

* dev: disable ga auto activity tracking update bugsnag
shalzz · Apr 23, 2018 · c7e79d5 · c7e79d5
2 parents f202f12 + 132d6d3
commit c7e79d5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -199,7 +199,7 @@ android {
         implementation 'de.psdev.licensesdialog:licensesdialog:1.8.0'
 
 	    //noinspection GradleDynamicVersion
-        implementation 'com.bugsnag:bugsnag-android:3.+'
+        implementation 'com.bugsnag:bugsnag-android:4.+'
 
         def jUnit = "junit:junit:4.12"
         def mockito = "org.mockito:mockito-core:2.6.2"

diff --git a/app/src/main/java/com/shalzz/attendance/MyApplication.java b/app/src/main/java/com/shalzz/attendance/MyApplication.java
@@ -44,6 +44,7 @@ public void onCreate() {
         Bugsnag.init(this)
                 .setMaxBreadcrumbs(100);
         Bugsnag.setNotifyReleaseStages("production", "development", "testing");
+        Bugsnag.setAutoCaptureSessions(true);
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 
         if (BuildConfig.DEBUG) {

diff --git a/app/src/main/java/com/shalzz/attendance/ui/main/MainPresenter.java b/app/src/main/java/com/shalzz/attendance/ui/main/MainPresenter.java
@@ -106,16 +106,14 @@ public void onNext(User user) {
                         if (isViewAttached()) {
                             getMvpView().updateUserDetails(user);
                         }
-                        Bugsnag.setUserId(user.id());
+                        Bugsnag.setUserId(user.phone());
 
                         SharedPreferences sharedPref =
                                 PreferenceManager.getDefaultSharedPreferences(mContext);
                         boolean optIn = sharedPref.getBoolean(mContext.getString(
                                 R.string.pref_key_bugsnag_opt_in), true);
                         if(optIn) {
-                            Bugsnag.setUserName(user.name());
-                            Bugsnag.addToTab("User", "phone", user.phone());
-                            Bugsnag.addToTab("User", "email", user.email());
+                            Bugsnag.setUser(user.phone(), user.email(), user.name());
                         }
 
                         mTracker.set("&uid", user.phone());

diff --git a/app/src/main/res/xml/app_tracker.xml b/app/src/main/res/xml/app_tracker.xml
@@ -24,7 +24,7 @@
     <integer name="ga_sessionTimeout">300</integer>
 
     <!-- Enable automatic Activity measurement -->
-    <bool name="ga_autoActivityTracking">true</bool>
+    <bool name="ga_autoActivityTracking">false</bool>
     <bool name="ga_reportUncaughtExceptions">false</bool>
 
     <!-- The screen names that will appear in reports -->