Skip to content

Bug fix in campaigns #2119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2018
Merged

Bug fix in campaigns #2119

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
351fe90
Bug fix in campaigns
ashishkumar468 Dec 14, 2018
f6f938a
remove hardcoded reference to camapign at index 0
ashishkumar468 Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,23 @@ public void getCampaigns() {
}
return date1.compareTo(date2);
});
Date campaignEndDate = null;
Date campaignEndDate, campaignStartDate;
Date currentDate = new Date();
try {
campaignEndDate = dateFormat.parse(campaigns.get(0).getEndDate());
for (Campaign aCampaign : campaigns) {
campaignEndDate = dateFormat.parse(aCampaign.getEndDate());
campaignStartDate =
dateFormat.parse(aCampaign.getStartDate());
if (campaignEndDate.compareTo(currentDate) >= 0
&& campaignStartDate.compareTo(currentDate) <= 0) {
campaign = aCampaign;
break;
}
}
} catch (ParseException e) {
e.printStackTrace();
}
if (campaignEndDate == null) {
view.showCampaigns(null);
} else if (campaignEndDate.compareTo(new Date()) > 0) {
campaign = campaigns.get(0);
view.showCampaigns(campaign);
} else {
Log.e(TAG, "The campaigns has already finished");
view.showCampaigns(null);
}
view.showCampaigns(campaign);
}

@Override public void onError(Throwable e) {
Expand Down