Skip to content

Commit eda33fd

Browse files
committed
Throw an IllegalArgumentException exception if a null context is passed
1 parent 7c69f90 commit eda33fd

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
import android.content.SharedPreferences;
55
import android.preference.PreferenceManager;
66

7-
import org.wordpress.android.util.AppLog;
8-
97
import java.util.ArrayList;
108
import java.util.List;
119
import java.util.Map;
12-
import java.util.UUID;
1310

1411
public final class AnalyticsTracker {
1512
private static boolean mHasUserOptedOut;

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.os.Build;
1010
import android.preference.PreferenceManager;
1111

12-
import com.automattic.android.tracks.TracksClient;
1312
import com.mixpanel.android.mpmetrics.MixpanelAPI;
1413

1514
import org.json.JSONException;
@@ -34,7 +33,7 @@ public class AnalyticsTrackerMixpanel extends Tracker {
3433
private static final String APP_LOCALE = "app_locale";
3534
private static final String MIXPANEL_ANON_ID = "mixpanel_user_anon_id";
3635

37-
public AnalyticsTrackerMixpanel(Context context, String token) {
36+
public AnalyticsTrackerMixpanel(Context context, String token) throws IllegalArgumentException {
3837
super(context);
3938
mAggregatedProperties = new EnumMap<AnalyticsTracker.Stat, JSONObject>(AnalyticsTracker.Stat.class);
4039
mMixpanel = MixpanelAPI.getInstance(context, token);

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.wordpress.android.analytics;
22

33
import android.content.Context;
4-
import android.content.SharedPreferences;
5-
import android.preference.PreferenceManager;
64

75
import com.automattic.android.tracks.TracksClient;
86

@@ -12,7 +10,6 @@
1210

1311
import java.util.HashMap;
1412
import java.util.Map;
15-
import java.util.UUID;
1613

1714
public class AnalyticsTrackerNosara extends Tracker {
1815

@@ -24,12 +21,8 @@ public class AnalyticsTrackerNosara extends Tracker {
2421

2522
private TracksClient mNosaraClient;
2623

27-
public AnalyticsTrackerNosara(Context context) {
24+
public AnalyticsTrackerNosara(Context context) throws IllegalArgumentException {
2825
super(context);
29-
if (null == context) {
30-
mNosaraClient = null;
31-
return;
32-
}
3326
mNosaraClient = TracksClient.getClient(context);
3427
}
3528

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/Tracker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ abstract void refreshMetadata(boolean isUserConnected,boolean isWordPressComUser
2323
private String mWpcomUserName = null;
2424
Context mContext;
2525

26-
public Tracker(Context context) {
26+
public Tracker(Context context) throws IllegalArgumentException {
2727
if (null == context) {
28-
return;
28+
throw new IllegalArgumentException("Tracker requires a not-null context");
2929
}
3030
mContext = context;
3131
}

0 commit comments

Comments
 (0)