Fixed UncaughtExceptionHandler not using the supplied base-TrackMe if…

… supplied. (#128)
matomo-org · Oct 28, 2016 · dc66ae9 · dc66ae9
1 parent d4393b4
commit dc66ae9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/piwik-sdk/src/main/java/org/piwik/sdk/PiwikExceptionHandler.java b/piwik-sdk/src/main/java/org/piwik/sdk/PiwikExceptionHandler.java
@@ -7,6 +7,9 @@
 
 package org.piwik.sdk;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import timber.log.Timber;
 
 /**
@@ -19,7 +22,7 @@ public class PiwikExceptionHandler implements Thread.UncaughtExceptionHandler {
     private final TrackMe mTrackMe;
     private final Thread.UncaughtExceptionHandler mDefaultExceptionHandler;
 
-    public PiwikExceptionHandler(Tracker tracker, TrackMe trackMe) {
+    public PiwikExceptionHandler(@NonNull Tracker tracker, @Nullable TrackMe trackMe) {
         mTracker = tracker;
         mTrackMe = trackMe;
         mDefaultExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
@@ -40,7 +43,7 @@ public Thread.UncaughtExceptionHandler getDefaultExceptionHandler() {
     public void uncaughtException(Thread thread, Throwable ex) {
         try {
             String excInfo = ex.getMessage();
-            TrackHelper.track().exception(ex).description(excInfo).fatal(true).with(getTracker());
+            TrackHelper.track(mTrackMe).exception(ex).description(excInfo).fatal(true).with(getTracker());
             // Immediately dispatch as the app might be dying after rethrowing the exception
             getTracker().dispatch();
         } catch (Exception e) {

diff --git a/piwik-sdk/src/main/java/org/piwik/sdk/TrackHelper.java b/piwik-sdk/src/main/java/org/piwik/sdk/TrackHelper.java
@@ -34,7 +34,7 @@ public static TrackHelper track() {
         return new TrackHelper();
     }
 
-    public static TrackHelper track(@NonNull TrackMe base) {
+    public static TrackHelper track(@Nullable TrackMe base) {
         return new TrackHelper(base);
     }