Skip to content

Commit 4425c36

Browse files
ashishkumar468misaochan
authored andcommitted
Bug fix in campaigns (commons-app#2119)
* Bug fix in campaigns * remove hardcoded reference to camapign at index 0
1 parent 46db38b commit 4425c36

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,23 @@ public void getCampaigns() {
7373
}
7474
return date1.compareTo(date2);
7575
});
76-
Date campaignEndDate = null;
76+
Date campaignEndDate, campaignStartDate;
77+
Date currentDate = new Date();
7778
try {
78-
campaignEndDate = dateFormat.parse(campaigns.get(0).getEndDate());
79+
for (Campaign aCampaign : campaigns) {
80+
campaignEndDate = dateFormat.parse(aCampaign.getEndDate());
81+
campaignStartDate =
82+
dateFormat.parse(aCampaign.getStartDate());
83+
if (campaignEndDate.compareTo(currentDate) >= 0
84+
&& campaignStartDate.compareTo(currentDate) <= 0) {
85+
campaign = aCampaign;
86+
break;
87+
}
88+
}
7989
} catch (ParseException e) {
8090
e.printStackTrace();
8191
}
82-
if (campaignEndDate == null) {
83-
view.showCampaigns(null);
84-
} else if (campaignEndDate.compareTo(new Date()) > 0) {
85-
campaign = campaigns.get(0);
86-
view.showCampaigns(campaign);
87-
} else {
88-
Log.e(TAG, "The campaigns has already finished");
89-
view.showCampaigns(null);
90-
}
92+
view.showCampaigns(campaign);
9193
}
9294

9395
@Override public void onError(Throwable e) {

0 commit comments

Comments
 (0)