mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't show the quiz pop-up twice (#3398)

Browse source 
* Avoid showing the quiz pop-up twice to the user

Due to the current flow of code it's possible that in
some cases the quiz pop-up is shown to the user twice.
This is unnecessary and unintentional.

So, change the logic in such a way that the quiz pop-up
would be never be shown twice to the user.

Fixes: #3281

* Quiz: remove unused parameters from methods

Some methods don't seem to be using the parameters that
they receive. So, just remove the unused parameters.
This commit is contained in:
Kaartic Sivaraam 2020-02-11 23:58:08 +05:30 • committed by GitHub
parent b65e4a1841
commit 6683ea40ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java
View file

@ -59,8 +59,7 @@ public class QuizChecker {
}
public void initQuizCheck(Activity activity) {
setUploadCount(activity);
setRevertCount(activity);
calculateRevertParameterAndShowQuiz(activity);
}
public void cleanup() {
@ -70,12 +69,12 @@ public class QuizChecker {
/**
* to fet the total number of images uploaded
*/
private void setUploadCount(Activity activity) {
private void setUploadCount() {
compositeDisposable.add(okHttpJsonApiClient
.getUploadCount(sessionManager.getUserName())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(uploadCount -> setTotalUploadCount(activity, uploadCount),
.subscribe(this::setTotalUploadCount,
t -> Timber.e(t, "Fetching upload count failed")
));
}
@ -85,20 +84,19 @@ public class QuizChecker {
* call function to check for quiz
* @param uploadCount user's upload count
*/
private void setTotalUploadCount(Activity activity, int uploadCount) {
private void setTotalUploadCount(int uploadCount) {
totalUploadCount = uploadCount - revertKvStore.getInt(UPLOAD_SHARED_PREFERENCE, 0);
if ( totalUploadCount < 0){
totalUploadCount = 0;
revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, 0);
}
isUploadCountFetched = true;
calculateRevertParameter(activity);
}
/**
* To call the API to get reverts count in form of JSONObject
*/
private void setRevertCount(Activity activity) {
private void setRevertCount() {
compositeDisposable.add(okHttpJsonApiClient
.getAchievements(sessionManager.getUserName())
.subscribeOn(Schedulers.io())
@ -106,7 +104,7 @@ public class QuizChecker {
.subscribe(
response -> {
if (response != null) {
setRevertParameter(activity, response.getDeletedUploads());
setRevertParameter(response.getDeletedUploads());
}
}, throwable -> Timber.e(throwable, "Fetching feedback failed"))
);
@ -116,20 +114,21 @@ public class QuizChecker {
* to calculate the number of images reverted after previous quiz
* @param revertCountFetched count of deleted uploads
*/
private void setRevertParameter(Activity activity, int revertCountFetched) {
private void setRevertParameter(int revertCountFetched) {
revertCount = revertCountFetched - revertKvStore.getInt(REVERT_SHARED_PREFERENCE, 0);
if (revertCount < 0){
revertCount = 0;
revertKvStore.putInt(REVERT_SHARED_PREFERENCE, 0);
}
isRevertCountFetched = true;
calculateRevertParameter(activity);
}
/**
* to check whether the criterion to call quiz is satisfied
*/
private void calculateRevertParameter(Activity activity) {
private void calculateRevertParameterAndShowQuiz(Activity activity) {
setUploadCount();
setRevertCount();
if ( revertCount < 0 || totalUploadCount < 0){
revertKvStore.putInt(REVERT_SHARED_PREFERENCE, 0);
revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, 0);