Fix generic compile

pull/685/merge
Alex Baker 8 years ago
parent 93fc3fd3cc
commit a7255dac3a

@ -8,14 +8,8 @@ public class Tracker {
@Inject @Inject
public Tracker() {} public Tracker() {}
public void setTrackingEnabled(boolean enabled) {}
public void reportException(Throwable t) { public void reportException(Throwable t) {
Timber.e(t, t.getMessage()); Timber.e(t);
}
public void reportException(Thread thread, Throwable t) {
Timber.e(t, t.getMessage());
} }
public void reportEvent(Tracking.Events event) {} public void reportEvent(Tracking.Events event) {}
@ -27,4 +21,8 @@ public class Tracker {
public void reportEvent(Tracking.Events category, String action, String label) {} public void reportEvent(Tracking.Events category, String action, String label) {}
public void reportIabResult(int resultCode, String skus) {} public void reportIabResult(int resultCode, String skus) {}
public static void report(Exception e) {
Timber.e(e);
}
} }

@ -19,9 +19,10 @@ import timber.log.Timber;
@ApplicationScope @ApplicationScope
public class Tracker { public class Tracker {
private static boolean enabled;
private final FirebaseAnalytics analytics; private final FirebaseAnalytics analytics;
private final Context context; private final Context context;
private final boolean enabled;
@Inject @Inject
public Tracker(@ForApplication Context context, Preferences preferences) { public Tracker(@ForApplication Context context, Preferences preferences) {
@ -35,13 +36,17 @@ public class Tracker {
} }
} }
public void reportException(Throwable t) { public static void report(Throwable t) {
Timber.e(t); Timber.e(t);
if (enabled) { if (enabled) {
Crashlytics.logException(t); Crashlytics.logException(t);
} }
} }
public void reportException(Throwable t) {
report(t);
}
public void reportEvent(Tracking.Events event) { public void reportEvent(Tracking.Events event) {
reportEvent(event, null); reportEvent(event, null);
} }

@ -6,11 +6,11 @@ import android.database.Cursor;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread; import android.support.annotation.WorkerThread;
import com.crashlytics.android.Crashlytics;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.tasks.analytics.Tracker;
import timber.log.Timber; import timber.log.Timber;
public class LimitOffsetDataSource extends PositionalDataSource<Task> { public class LimitOffsetDataSource extends PositionalDataSource<Task> {
@ -32,7 +32,7 @@ public class LimitOffsetDataSource extends PositionalDataSource<Task> {
cursor = mDb.query(mCountQuery, null); cursor = mDb.query(mCountQuery, null);
} catch (Exception e) { } catch (Exception e) {
Timber.e(e); Timber.e(e);
Crashlytics.logException(e); Tracker.report(e);
return 0; return 0;
} }
try { try {

Loading…
Cancel
Save