File tree Expand file tree Collapse file tree 1 file changed +13
-11
lines changed
app/src/main/java/fr/free/nrw/commons/campaigns Expand file tree Collapse file tree 1 file changed +13
-11
lines changed Original file line number Diff line number Diff 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 ) {
You can’t perform that action at this time.
0 commit comments