-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[WIP] Refactor feedback and quiz to reduce possibility of NPE (#1881)
* Refactor feedback and quiz to reduce possibility of NPE * Handle throwables in quiz checker * Minor refactoring
- Loading branch information
1 parent
54caad2
commit 6eb01b8
Showing
10 changed files
with
182 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
app/src/main/java/fr/free/nrw/commons/achievements/FeaturedImages.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package fr.free.nrw.commons.achievements; | ||
|
|
||
| import com.google.gson.annotations.SerializedName; | ||
|
|
||
| public class FeaturedImages { | ||
|
|
||
| @SerializedName("Quality_images") | ||
| private final int qualityImages; | ||
|
|
||
| @SerializedName("Featured_pictures_on_Wikimedia_Commons") | ||
| private final int featuredPicturesOnWikimediaCommons; | ||
|
|
||
| public FeaturedImages(int qualityImages, int featuredPicturesOnWikimediaCommons) { | ||
| this.qualityImages = qualityImages; | ||
| this.featuredPicturesOnWikimediaCommons = featuredPicturesOnWikimediaCommons; | ||
| } | ||
|
|
||
| public int getQualityImages() { | ||
| return qualityImages; | ||
| } | ||
|
|
||
| public int getFeaturedPicturesOnWikimediaCommons() { | ||
| return featuredPicturesOnWikimediaCommons; | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
app/src/main/java/fr/free/nrw/commons/achievements/FeedbackResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package fr.free.nrw.commons.achievements; | ||
|
|
||
| public class FeedbackResponse { | ||
|
|
||
| private final String status; | ||
| private final int uniqueUsedImages; | ||
| private final int articlesUsingImages; | ||
| private final int deletedUploads; | ||
| private final FeaturedImages featuredImages; | ||
| private final int thanksReceived; | ||
| private final String user; | ||
| private final int imagesEditedBySomeoneElse; | ||
|
|
||
|
|
||
| public FeedbackResponse(String status, | ||
| int uniqueUsedImages, | ||
| int articlesUsingImages, | ||
| int deletedUploads, | ||
| FeaturedImages featuredImages, | ||
| int thanksReceived, | ||
| String user, | ||
| int imagesEditedBySomeoneElse) { | ||
| this.status = status; | ||
| this.uniqueUsedImages = uniqueUsedImages; | ||
| this.articlesUsingImages = articlesUsingImages; | ||
| this.deletedUploads = deletedUploads; | ||
| this.featuredImages = featuredImages; | ||
| this.thanksReceived = thanksReceived; | ||
| this.user = user; | ||
| this.imagesEditedBySomeoneElse = imagesEditedBySomeoneElse; | ||
| } | ||
|
|
||
| public String getStatus() { | ||
| return status; | ||
| } | ||
|
|
||
| public int getUniqueUsedImages() { | ||
| return uniqueUsedImages; | ||
| } | ||
|
|
||
| public int getArticlesUsingImages() { | ||
| return articlesUsingImages; | ||
| } | ||
|
|
||
| public int getDeletedUploads() { | ||
| return deletedUploads; | ||
| } | ||
|
|
||
| public FeaturedImages getFeaturedImages() { | ||
| return featuredImages; | ||
| } | ||
|
|
||
| public int getThanksReceived() { | ||
| return thanksReceived; | ||
| } | ||
|
|
||
| public String getUser() { | ||
| return user; | ||
| } | ||
|
|
||
| public int getImagesEditedBySomeoneElse() { | ||
| return imagesEditedBySomeoneElse; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.