Skip to content

Conversation

@ashishkumar468
Copy link
Collaborator

Description (required)

Fixes #4552

What changes did you make and why?

Updated the dates for the campaign from 1 Sep to 30 Sep

Tests performed (required)

Tested betaDebug on API 29

@ashishkumar468 ashishkumar468 changed the title Update WLM camaign dates Update WLM camaign dates [Do not merge now, merge only after alpha release] Aug 26, 2021
Copy link
Collaborator

@neslihanturan neslihanturan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @ashishkumar468 , I have tested this PR. Some unexpected date format and wrong dates appears on the banner. Also I am sure I am on the correct commit.
image
image

@ashishkumar468
Copy link
Collaborator Author

Sorry for the trouble @neslihanturan, let me look into this

@ashishkumar468
Copy link
Collaborator Author

image

if(date.getDay()>=1 && date.getMonth()>=9 && date.getDay()<=31 && date.getMonth()<=10 ){
public static boolean isMonumentsEnabled(final Date date) {
if (date.getDate() >= 1 && date.getMonth() >= 8 && date.getDate() <= 30
&& date.getMonth() <= 8) {
Copy link
Member

@misaochan misaochan Aug 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the month be == 9 exactly? We want it to be active only from 1 Sep to 30 Sep.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its actually 0 index based

@misaochan
Copy link
Member

Required for v3.1.0 beta. Cannot release without, because then people who don't update their app will be getting WLM markers after the competition is over.

@neslihanturan
Copy link
Collaborator

Hey hi, here are test results:

  • Phone date is set to current date 30 August:
    image
    image
    I think we expect this banner became invisible. I thought it may cause my previous test and tried with a fresh install and I recognized that I am getting "Chain validation failed" error consistently. I have tried to login my accounts from web interface and it worked. I am not blocked or anything but I can not login via the app (both this branch and master).

@misaochan
Copy link
Member

As discussed with Nes, this works now, merging.

@misaochan misaochan merged commit 74e8472 into commons-app:3.1-release Sep 1, 2021
misaochan added a commit that referenced this pull request Sep 16, 2021
* Cherry-Picked NPE fix from master (#4569)

* Fix notification bug #4547 (#4570)

* Make Single Query for Nearby and WLM pins (#4573)

* Merge nearby and monument queries

* Bug Fix- query resource path change on shouldQueryForMonuments

* Bug Fixes
1. Propagate exceptions for nearby API calls to caller
2. Fix too much work on main thread exception in NearbyParentFragment

* Modify parameters for Nearby query

* Bug fix- current location marker (#4580)

* Move WLM template below geolocation template (#4582)

* Modify string for WLM upload notice

* Fix bug #4583 (#4591)

* Fix bug #4585 by updating kotlin and acra version (#4592)

* Fixes #4554 - only use WLM2021 template for countries that are included in it (#4574)

* Fixes #4554
1. For WLM uploads reverse geo code and see if the country code is supported -only then is the WLM upload flow triggered, otherwise usual nearby uploads happen
2. Bug Fix - Current Location marker and area

* Fixed compile error added after rebasing

* Bug fix for country code in reverse geo code

* Update WLM camaign dates [Do not merge now, merge only after alpha release] (#4584)

* Updates dates for WML campaign

* Bug fix- campaign dates

* Fixed logic for WLM enablement - stick to the month of September

* Add countries supported by WLM2021 template, except Italy

* Versioning for v3.1.0

* Update changelog.md

* Fix empty default lang bug (#4608)

* Fix bug #4583

* Fix empty default lang bug

* Fixes #4595 - Updated nearby query (#4622)

* Fixes #4595 - Updated nearby query

* Removed logic to replace local language in nearby query - that might acccidentally replace other strings

* Fetch property location in usual nearby query

* Remove duplicate line (#4626)

* Change "learn more" link to new wiki

* Add Sweden's P3426 to property filter

* Fixes #4601 - 1. Handle possible exceptions in upload file from stash 2. Modify MWException, as error is nullable, update getTitle and getMessage to rever that (#4627)

* Versioning for v3.1.1

* Update changelog.md

* Updated DB version to rever integrity

Co-authored-by: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com>
Co-authored-by: Josephine Lim <josephinelim86@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants