Merge branch 'wikidataEdits' into wikidata

Author: Vivek Maskara

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

@@ -15,16 +15,23 @@
 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;
 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;

app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -446,7 +446,6 @@ public void onAnimationRepeat(Animator animator) {
         });
     }
 
-
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            @NonNull String[] permissions, @NonNull int[] grantResults) {