Merge changes from 3.1-release (commons-app#4629)

* Cherry-Picked NPE fix from master (commons-app#4569)

* Fix notification bug commons-app#4547 (commons-app#4570)

* Make Single Query for Nearby and WLM pins (commons-app#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 (commons-app#4580)

* Move WLM template below geolocation template (commons-app#4582)

* Modify string for WLM upload notice

* Fix bug commons-app#4583 (commons-app#4591)

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

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

* Fixes commons-app#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] (commons-app#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 (commons-app#4608)

* Fix bug commons-app#4583

* Fix empty default lang bug

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

* Fixes commons-app#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 (commons-app#4626)

* Change "learn more" link to new wiki

* Add Sweden's P3426 to property filter

* Fixes commons-app#4601 - 1. Handle possible exceptions in upload file from stash 2. Modify MWException, as error is nullable, update getTitle and getMessage to rever that (commons-app#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>

Author: 3 people

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Wikimedia Commons for Android
 
+## v3.1.1
+- Optimized Nearby query
+- Added Sweden's property for WLM 2021
+- Added link to wiki explaining how to contribute to WLM through app
+- Fixed various bugs and crashes
+
+## v3.1.0
+- Added Wiki Loves Monuments integration for WLM 2021
+
 ## v3.0.2
 - Fixed crash when uploading high res image
 - Fixed crash when viewing images in Explore

app/build.gradle

@@ -58,8 +58,8 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp-ws:$OKHTTP_VERSION"
 
     // Logging
-    implementation 'ch.acra:acra-dialog:5.8.1-beta11'
-    implementation 'ch.acra:acra-mail:5.8.1-beta11'
+    implementation 'ch.acra:acra-dialog:5.8.4'
+    implementation 'ch.acra:acra-mail:5.8.4'
     implementation 'org.slf4j:slf4j-api:1.7.25'
     api('com.github.tony19:logback-android-classic:1.1.1-6') {
         exclude group: 'com.google.android', module: 'android'
@@ -155,8 +155,8 @@ android {
     defaultConfig {
         //applicationId 'fr.free.nrw.commons'
 
-        versionCode 1021
-        versionName '3.0.2'
+        versionCode 1025
+        versionName '3.1.1'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19
@@ -226,7 +226,7 @@ android {
     }
 
     configurations.all {
-        resolutionStrategy.force 'androidx.annotation:annotation:1.0.2'
+        resolutionStrategy.force 'androidx.annotation:annotation:1.1.0'
         exclude module: 'okhttp-ws'
     }
     flavorDimensions 'tier'

app/src/main/java/fr/free/nrw/commons/Media.kt

@@ -12,19 +12,19 @@ class Media constructor(
      * @return pageId for the current media object
      * Wikibase Identifier associated with media files
      */
-    val pageId: String = UUID.randomUUID().toString(),
-    val thumbUrl: String? = null,
+    var pageId: String = UUID.randomUUID().toString(),
+    var thumbUrl: String? = null,
 
     /**
      * Gets image URL
      * @return Image URL
      */
-    val imageUrl: String? = null,
+    var imageUrl: String? = null,
     /**
      * Gets the name of the file.
      * @return file name as a string
      */
-    val filename: String? = null,
+    var filename: String? = null,
     /**
      * Gets the file description.
      * @return file description as a string
@@ -41,7 +41,7 @@ class Media constructor(
      * Can be null.
      * @return upload date as a Date
      */
-    val dateUploaded: Date? = null,
+    var dateUploaded: Date? = null,
     /**
      * Gets the license name of the file.
      * @return license as a String
@@ -52,7 +52,7 @@ class Media constructor(
      * @param license license name as a String
      */
     var license: String? = null,
-    val licenseUrl: String? = null,
+    var licenseUrl: String? = null,
     /**
      * Gets the name of the creator of the file.
      * @return author name as a String
@@ -69,15 +69,15 @@ class Media constructor(
      * Gets the categories the file falls under.
      * @return file categories as an ArrayList of Strings
      */
-    val categories: List<String>? = null,
+    var categories: List<String>? = null,
     /**
      * Gets the coordinates of where the file was created.
      * @return file coordinates as a LatLng
      */
     var coordinates: LatLng? = null,
-    val captions: Map<String, String> = emptyMap(),
-    val descriptions: Map<String, String> = emptyMap(),
-    val depictionIds: List<String> = emptyList()
+    var captions: Map<String, String> = emptyMap(),
+    var descriptions: Map<String, String> = emptyMap(),
+    var depictionIds: List<String> = emptyList()
 ) : Parcelable {
 
     constructor(

app/src/main/java/fr/free/nrw/commons/Utils.java

@@ -218,12 +218,11 @@ public static void setUnderlinedText(TextView textView, int stringResourceName,
      * @param date
      * @return
      */
-    public static boolean isMonumentsEnabled(final Date date, final JsonKvStore store){
-        if(date.getDay()>=1 && date.getMonth()>=9 && date.getDay()<=31 && date.getMonth()<=10 ){
+    public static boolean isMonumentsEnabled(final Date date) {
+        if (date.getMonth() == 8) {
             return true;
         }
-
-        return store.getBoolean(CAMPAIGNS_DEFAULT_PREFERENCE) || true ;
+        return false;
     }
 
     /**
@@ -241,7 +240,7 @@ public static String getWLMStartDate() {
      * @return
      */
     public static String getWLMEndDate() {
-        return "31 Oct";
+        return "30 Sep";
     }
 
 }

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

@@ -117,9 +117,8 @@ public void init() {
                             .parse(campaign.getStartDate());
                         final Date endDate = CommonsDateUtil.getIso8601DateFormatShort()
                             .parse(campaign.getEndDate());
-                        tvDates.setText(
-                            String.format("%1s - %2s", startDate,
-                                endDate));
+                        tvDates.setText(String.format("%1s - %2s", DateUtil.getExtraShortDateString(startDate),
+                            DateUtil.getExtraShortDateString(endDate)));
                     }
                 } catch (final ParseException e) {
                     e.printStackTrace();

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

@@ -40,7 +40,8 @@ data class Contribution constructor(
     var dateCreated: Date? = null,
     var dateModified: Date? = null,
     var hasInvalidLocation : Int =  0,
-    var contentUri: Uri? = null
+    var contentUri: Uri? = null,
+    var countryCode : String? = null
 ) : Parcelable {
 
     fun completeWith(media: Media): Contribution {

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

@@ -454,7 +454,7 @@ private void displayYouWontSeeNearbyMessage() {
     private void updateClosestNearbyCardViewInfo() {
         curLatLng = locationManager.getLastLocation();
         compositeDisposable.add(Observable.fromCallable(() -> nearbyController
-                .loadAttractionsFromLocation(curLatLng, curLatLng, true, false)) // thanks to boolean, it will only return closest result
+                .loadAttractionsFromLocation(curLatLng, curLatLng, true, false, false)) // thanks to boolean, it will only return closest result
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::updateNearbyNotification,
@@ -528,7 +528,7 @@ public void onLocationChangedMedium(LatLng latLng) {
      * of campaigns on the campaigns card
      */
     private void fetchCampaigns() {
-        if (Utils.isMonumentsEnabled(new Date(), store)) {
+        if (Utils.isMonumentsEnabled(new Date())) {
             campaignView.setCampaign(wlmCampaign);
             campaignView.setVisibility(View.VISIBLE);
         } else if (store.getBoolean(CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE, true)) {

app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java

@@ -13,7 +13,7 @@
 public class DBOpenHelper  extends SQLiteOpenHelper {
 
     private static final String DATABASE_NAME = "commons.db";
-    private static final int DATABASE_VERSION = 18;
+    private static final int DATABASE_VERSION = 19;
     public static final String CONTRIBUTIONS_TABLE = "contributions";
     private final String DROP_TABLE_STATEMENT="DROP TABLE IF EXISTS %s";
 

app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt

@@ -14,7 +14,7 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao
  * The database for accessing the respective DAOs
  *
  */
-@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 9, exportSchema = false)
+@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 10, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun contributionDao(): ContributionDao

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -373,8 +373,6 @@ public void onResume() {
             media = getArguments().getParcelable("media");
         }
 
-        media = detailProvider.getMediaAtPosition(index);
-
         if(media != null && applicationKvStore.getBoolean(String.format(NOMINATING_FOR_DELETION_MEDIA, media.getImageUrl()), false)) {
             enableProgressBar();
         }