Fixes #4554 - only use WLM2021 template for countries that are included in it #4574
Conversation
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
| } | ||
|
|
||
| public boolean isWMLSupportedForThisPlace() { | ||
| return uploadModel.getItems().get(0).isWLMUpload(); |
There was a problem hiding this comment.
As the place is same for all, checking this at least for one item will do the job
|
Hey @ashishkumar468 , is there any list to see WLM active countries, so that we can try them during test? |
|
Yes NES, for now we had only enabled for Australia, Ireland and India |
|
@neslihanturan To clarify, Ashish is only adding a basic framework in this PR, with those sample countries. We don't have the actual list yet because the WLM organizers haven't finalized it yet, and it will only be finalized close to the start date of WLM. So when it is, I can edit the list to update it. But yes, for testing we can use those countries (and also test a country that isn't included in Ashish's list, to make sure that WLM templates etc don't trigger with them). |
neslihanturan
left a comment
There was a problem hiding this comment.
This fixed current location issue on tab change but after I tried WLM in Australia (which worked) I came back to my current location. But my current location marker was missing. It never came back.
|
@ashishkumar468 just realized that the same PR handles both issues. Can we split them into two? Because the location marker fix needs to be merged ASAP before alpha, whereas the country checks actually can't be merged until after alpha. |
|
Test results: Uploaded https://commons.wikimedia.org/wiki/File:Newstead_Gasworks_6.jpg for AU (in sample list of countries). Works as intended except that:
Uploaded https://commons.wikimedia.org/wiki/File:Presidio_of_San_Francisco.jpg for US (NOT in sample list of countries).
|
e19c78d to
091ab1d
Compare
|
Perfect, all sorted now and ready for merge after alpha is released. :) |
|
TODO: I need to pull the list of country codes from the template |
* 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>
Description (required)
Fixes #4554
What changes did you make and why?
Tests performed (required)
Tested betaDebug on API 29