Skip to content

Commit 06dbfef

Browse files
ashishkumar468maskaravivek
authored andcommitted
* Added null check on countResponse in OkHttpJsonApiClient$getWikidataEdits
1 parent aabcd0e commit 06dbfef

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

+18-21
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,8 @@
33
import android.text.TextUtils;
44
import androidx.annotation.NonNull;
55
import androidx.annotation.Nullable;
6-
76
import com.google.gson.Gson;
87
import com.google.gson.reflect.TypeToken;
9-
10-
import org.apache.commons.lang3.StringUtils;
11-
import org.wikipedia.dataclient.mwapi.MwQueryPage;
12-
import org.wikipedia.dataclient.mwapi.MwQueryResponse;
13-
import org.wikipedia.dataclient.mwapi.RecentChange;
14-
import org.wikipedia.util.DateUtil;
15-
16-
import java.io.IOException;
17-
import java.lang.reflect.Type;
18-
import java.util.ArrayList;
19-
import java.util.Date;
20-
import java.util.List;
21-
import java.util.Locale;
22-
import java.util.Map;
23-
import java.util.Random;
24-
25-
import javax.inject.Inject;
26-
import javax.inject.Singleton;
27-
288
import fr.free.nrw.commons.Media;
299
import fr.free.nrw.commons.achievements.FeaturedImages;
3010
import fr.free.nrw.commons.achievements.FeedbackResponse;
@@ -40,10 +20,25 @@
4020
import fr.free.nrw.commons.wikidata.model.GetWikidataEditCountResponse;
4121
import io.reactivex.Observable;
4222
import io.reactivex.Single;
23+
import java.io.IOException;
24+
import java.lang.reflect.Type;
25+
import java.util.ArrayList;
26+
import java.util.Date;
27+
import java.util.List;
28+
import java.util.Locale;
29+
import java.util.Map;
30+
import java.util.Random;
31+
import javax.inject.Inject;
32+
import javax.inject.Singleton;
4333
import okhttp3.HttpUrl;
4434
import okhttp3.OkHttpClient;
4535
import okhttp3.Request;
4636
import okhttp3.Response;
37+
import org.apache.commons.lang3.StringUtils;
38+
import org.wikipedia.dataclient.mwapi.MwQueryPage;
39+
import org.wikipedia.dataclient.mwapi.MwQueryResponse;
40+
import org.wikipedia.dataclient.mwapi.RecentChange;
41+
import org.wikipedia.util.DateUtil;
4742
import timber.log.Timber;
4843

4944
/**
@@ -132,7 +127,9 @@ public Single<Integer> getWikidataEdits(String userName) {
132127
return 0;
133128
}
134129
GetWikidataEditCountResponse countResponse = gson.fromJson(json, GetWikidataEditCountResponse.class);
135-
return countResponse.getWikidataEditCount();
130+
if (null != countResponse) {
131+
return countResponse.getWikidataEditCount();
132+
}
136133
}
137134
return 0;
138135
});

0 commit comments

Comments
 (0)