Bug fix #1504 (#1506)

* Bug fix #1504

* Filtered messages with ConnectException [issue #1504]

* A generalised message for exceptions in Nearby Activity [issue #1504]

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

@@ -16,6 +16,7 @@ import android.support.design.widget.BottomSheetBehavior;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AlertDialog;
 
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -23,9 +24,14 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 
+import android.widget.Toast;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
+import io.reactivex.functions.Consumer;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.UnknownHostException;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -427,8 +433,14 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
                     .loadAttractionsFromLocation(curLatLng))
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(this::populatePlaces);
+                    .subscribe(this::populatePlaces,
-        } else if (locationChangeType.equals(LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED)) {
+                            throwable -> {
+                                Timber.d(throwable);
+                                showErrorMessage(getString(R.string.error_fetching_nearby_places));
+                                progressBar.setVisibility(View.GONE);
+                            });
+        } else if (locationChangeType
+                .equals(LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED)) {
             Gson gson = new GsonBuilder()
                     .registerTypeAdapter(Uri.class, new UriSerializer())
                     .create();
@@ -451,7 +463,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
         if (placeList.size() == 0) {
             ViewUtil.showSnackbar(findViewById(R.id.container), R.string.no_nearby);
         }
-        
+
         bundle.putString("PlaceList", gsonPlaceList);
         //bundle.putString("CurLatLng", gsonCurLatLng);
         bundle.putString("BoundaryCoord", gsonBoundaryCoordinates);
@@ -580,7 +592,12 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
                         .loadAttractionsFromLocation(curLatLng))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(this::populatePlaces);
+                        .subscribe(this::populatePlaces,
+                                throwable -> {
+                                    Timber.d(throwable);
+                                    showErrorMessage(getString(R.string.error_fetching_nearby_places));
+                                    progressBar.setVisibility(View.GONE);
+                                });
                 nearbyMapFragment.setBundleForUpdtes(bundle);
                 nearbyMapFragment.updateMapSignificantly();
                 updateListFragment();
@@ -646,4 +663,8 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
     public void prepareViewsForSheetPosition(int bottomSheetState) {
         // TODO
     }
+
+    private void showErrorMessage(String message) {
+        ViewUtil.showLongToast(NearbyActivity.this, message);
+    }
 }

app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java

@@ -7,6 +7,7 @@ import android.support.graphics.drawable.VectorDrawableCompat;
 
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -44,7 +45,7 @@ public class NearbyController {
      * @return NearbyPlacesInfo a variable holds Place list without distance information
      * and boundary coordinates of current Place List
      */
-    public NearbyPlacesInfo loadAttractionsFromLocation(LatLng curLatLng) {
+    public NearbyPlacesInfo loadAttractionsFromLocation(LatLng curLatLng) throws IOException {
 
         Timber.d("Loading attractions near %s", curLatLng);
         NearbyPlacesInfo nearbyPlacesInfo = new NearbyPlacesInfo();

app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java

@@ -40,10 +40,9 @@ public class NearbyPlaces {
         }
     }
 
-    List<Place> getFromWikidataQuery(LatLng curLatLng, String lang) {
+    List<Place> getFromWikidataQuery(LatLng curLatLng, String lang) throws IOException {
         List<Place> places = Collections.emptyList();
 
-        try {
             // increase the radius gradually to find a satisfactory number of nearby places
             while (radius <= MAX_RADIUS) {
                 places = getFromWikidataQuery(curLatLng, lang, radius);
@@ -54,13 +53,6 @@ public class NearbyPlaces {
                     radius *= RADIUS_MULTIPLIER;
                 }
             }
-        } catch (IOException e) {
-            Timber.d(e.toString());
-            // errors tend to be caused by too many results (and time out)
-            // try a small radius next time
-            Timber.d("back to initial radius: %f", radius);
-            radius = INITIAL_RADIUS;
-        }
         // make sure we will be able to send at least one request next time
         if (radius > MAX_RADIUS) {
             radius = MAX_RADIUS;

app/src/main/res/values/strings.xml

@@ -282,5 +282,6 @@
 
   <string name="share_app_title">Share App</string>
   <string name="share_coordinates_not_present">Coordinates were not specified during image selection</string>
+  <string name="error_fetching_nearby_places">Error fetching nearby places.</string>
 
 </resources>