Bug fix for country code in reverse geo code

Author: ashishkumar468

app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java

@@ -95,14 +95,6 @@ public void onClick(View v) {
     @Override
     public void onResume() {
         super.onResume();
-        /**
-         * Show the wlm info message if the upload is a WLM upload
-         */
-        if(callback.isWLMUpload() && presenter.isWLMSupportedForThisPlace()){
-            llInfoMonumentUpload.setVisibility(View.VISIBLE);
-        }else{
-            llInfoMonumentUpload.setVisibility(View.GONE);
-        }
     }
 
     /**
@@ -232,4 +224,16 @@ public void onSubmitButtonClicked() {
         callback.onNextButtonClicked(callback.getIndexInViewFlipper(this));
     }
 
+    @Override
+    protected void onBecameVisible() {
+        super.onBecameVisible();
+        /**
+         * Show the wlm info message if the upload is a WLM upload
+         */
+        if(callback.isWLMUpload() && presenter.isWLMSupportedForThisPlace()){
+            llInfoMonumentUpload.setVisibility(View.VISIBLE);
+        }else{
+            llInfoMonumentUpload.setVisibility(View.GONE);
+        }
+    }
 }

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java

@@ -93,7 +93,7 @@ public void receiveImage(final UploadableFile uploadableFile, final Place place)
             repository
                 .preProcessImage(uploadableFile, place, this)
                 .map(uploadItem -> {
-                    if(place.isMonument()){
+                    if(place!=null && place.isMonument()){
                         if (place.location != null) {
                             final String countryCode = reverseGeoCode(place.location);
                             if (countryCode != null && WLM_SUPPORTED_COUNTRIES
@@ -132,8 +132,9 @@ private String reverseGeoCode(final LatLng latLng){
             final List<Address> addresses = geocoder
                 .getFromLocation(latLng.getLatitude(), latLng.getLongitude(), 1);
             for (final Address address : addresses) {
-                if (address != null && address.getLocale().getISO3Country() != null) {
-                    return address.getLocale().getCountry();
+                if (address != null && address.getCountryCode() != null) {
+                    String countryCode = address.getCountryCode();
+                    return countryCode;
                 }
             }
         } catch (final IOException e) {