Rewrote reverseGeoCode() method to use Coordinates2Country library (#5093)

* rewrote reverseGeoCode() method to use Coordinates2Country library; wrote simple TC for receiveImage() method to check if country coordinates are set

* removed unused slf4j import in UploadMediaPresenter class

* updated mock in for setCorrectCountryCodeForReceivedImage() TC to match against exact location arguments

* added javadoc for getCountryNamesAndCodes() method in UploadMediaPresenter; implemented "lazy loading" for countryNamesAndCodes field

* removed unused field added by me from UploadMediaPresenterTest

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

@@ -7,10 +7,7 @@ import static fr.free.nrw.commons.utils.ImageUtils.FILE_NAME_EXISTS;
 import static fr.free.nrw.commons.utils.ImageUtils.IMAGE_KEEP;
 import static fr.free.nrw.commons.utils.ImageUtils.IMAGE_OK;
 
-import android.location.Address;
-import android.location.Geocoder;
 import androidx.annotation.Nullable;
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.filepicker.UploadableFile;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
@@ -23,17 +20,19 @@ import fr.free.nrw.commons.upload.UploadItem;
 import fr.free.nrw.commons.upload.UploadMediaDetail;
 import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailsContract.UserActionListener;
 import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailsContract.View;
+import io.github.coordinates2country.Coordinates2Country;
 import io.reactivex.Maybe;
 import io.reactivex.Scheduler;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import java.io.IOException;
 import java.lang.reflect.Proxy;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.jetbrains.annotations.NotNull;
@@ -57,6 +56,7 @@ public class UploadMediaPresenter implements UserActionListener, SimilarImageInt
     private Scheduler mainThreadScheduler;
 
     private final List<String> WLM_SUPPORTED_COUNTRIES= Arrays.asList("am","at","az","br","hr","sv","fi","fr","de","gh","in","ie","il","mk","my","mt","pk","pe","pl","ru","rw","si","es","se","tw","ug","ua","us");
+    private Map<String, String> countryNamesAndCodes = null;
 
     @Inject
     public UploadMediaPresenter(UploadRepository uploadRepository,
@@ -124,22 +124,32 @@ public class UploadMediaPresenter implements UserActionListener, SimilarImageInt
 
     @Nullable
     private String reverseGeoCode(final LatLng latLng){
-        final Geocoder geocoder = new Geocoder(
-            CommonsApplication.getInstance().getApplicationContext(), Locale
-            .getDefault());
-        try {
-            final List<Address> addresses = geocoder
-                .getFromLocation(latLng.getLatitude(), latLng.getLongitude(), 1);
-            for (final Address address : addresses) {
-                if (address != null && address.getCountryCode() != null) {
-                    String countryCode = address.getCountryCode();
-                    return countryCode;
-                }
-            }
-        } catch (final IOException e) {
-            Timber.e(e);
+        if(countryNamesAndCodes == null){
+            countryNamesAndCodes = getCountryNamesAndCodes();
         }
-        return null;
+        return countryNamesAndCodes.get(Coordinates2Country.country(latLng.getLatitude(), latLng.getLongitude()));
+    }
+
+    /**
+     * Creates HashMap containing all ISO countries 2-letter codes provided by <code>Locale.getISOCountries()</code>
+     * and their english names
+     *
+     * @return HashMap where Key is country english name and Value is 2-letter country code
+     * e.g. ["Germany":"DE", ...]
+     */
+    private Map<String, String> getCountryNamesAndCodes(){
+        final Map<String, String> result = new HashMap<>();
+
+        final String[] isoCountries = Locale.getISOCountries();
+
+        for (final String isoCountry : isoCountries) {
+            result.put(
+                new Locale("en", isoCountry).getDisplayCountry(Locale.ENGLISH),
+                isoCountry
+            );
+        }
+
+        return result;
     }
 
     /**

app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt

@@ -1,31 +1,37 @@
 package fr.free.nrw.commons.upload
 
+import android.net.Uri
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import fr.free.nrw.commons.filepicker.UploadableFile
 import fr.free.nrw.commons.kvstore.JsonKvStore
+import fr.free.nrw.commons.location.LatLng
 import fr.free.nrw.commons.nearby.Place
 import fr.free.nrw.commons.repository.UploadRepository
 import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailsContract
 import fr.free.nrw.commons.upload.mediaDetails.UploadMediaPresenter
 import fr.free.nrw.commons.utils.ImageUtils.*
+import io.github.coordinates2country.Coordinates2Country
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.TestScheduler
+import junit.framework.TestCase.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.mockito.ArgumentMatchers
-import org.mockito.ArgumentMatchers.eq
-import org.mockito.Mock
-import org.mockito.Mockito
+import org.junit.runner.RunWith
+import org.mockito.*
 import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
 
 /**
  * The class contains unit test cases for UploadMediaPresenter
  */
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(Coordinates2Country::class)
 class UploadMediaPresenterTest {
     @Mock
     internal lateinit var repository: UploadRepository
@@ -151,7 +157,7 @@ class UploadMediaPresenterTest {
         //Bad Picture test
         //Empty Caption test
         uploadMediaPresenter.handleImageResult(-7, uploadItem)
-        verify(view)?.showBadImagePopup(ArgumentMatchers.anyInt(), eq(uploadItem))
+        verify(view)?.showBadImagePopup(ArgumentMatchers.anyInt(), ArgumentMatchers.eq(uploadItem))
 
     }
 
@@ -239,4 +245,43 @@ class UploadMediaPresenterTest {
         verify(view).showSimilarImageFragment("original", "possible", similar)
     }
 
+    @Test
+    fun setCorrectCountryCodeForReceivedImage() {
+
+        val germanyAsPlace = Place(null,null, null, null, LatLng(50.1, 10.2, 1.0f), null, null, null, true)
+        germanyAsPlace.isMonument = true
+
+        PowerMockito.mockStatic(Coordinates2Country::class.java)
+
+        whenever(
+            Coordinates2Country.country(
+                ArgumentMatchers.eq(germanyAsPlace.getLocation().latitude),
+                ArgumentMatchers.eq(germanyAsPlace.getLocation().longitude)
+            )
+        ).thenReturn("Germany")
+
+        val item: Observable<UploadItem> = Observable.just(UploadItem(Uri.EMPTY, null, null, germanyAsPlace, 0, null, null, null))
+
+        whenever(
+            repository.preProcessImage(
+                ArgumentMatchers.any(UploadableFile::class.java),
+                ArgumentMatchers.any(Place::class.java),
+                ArgumentMatchers.any(UploadMediaPresenter::class.java)
+            )
+        ).thenReturn(item)
+
+        uploadMediaPresenter.receiveImage(uploadableFile, germanyAsPlace)
+        verify(view).showProgress(true)
+        testScheduler.triggerActions()
+
+        val captor: ArgumentCaptor<UploadItem> = ArgumentCaptor.forClass(UploadItem::class.java)
+        verify(view).onImageProcessed(
+            captor.capture(),
+            ArgumentMatchers.any(Place::class.java)
+        )
+
+        assertEquals("Exptected contry code", "de", captor.value.countryCode);
+
+        verify(view).showProgress(false)
+    }
 }