Merge branch 'master' into master

Author: ShridharGoel

ISSUE_TEMPLATE.md

@@ -1,25 +1,18 @@
-_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
-
 **Summary:** 
 
 Summarize your issue in one sentence (what goes wrong, what did you expect to happen)
 
+_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
+
 **Steps to reproduce:** 
 
-How can we reproduce the issue?
+How can we reproduce the issue? 
+What did you expect the app to do, and what did you see instead?
 
 **Add System logs:**
 
 Add logcat files here (if possible).
 
-**Expected behavior:** 
-
-What did you expect the App to do?
-
-**Observed behavior:** 
-
-What did you see instead?  Describe your issue in detail here.
-
 **Device and Android version:** 
 
 What make and model device (e.g., Samsung J7) did you encounter this on?  What Android
@@ -28,7 +21,7 @@ version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are yo
 
  **Commons app version:** 
 
-You can find this information by going to the navigation drawer in the app and tapping 'About'
+You can find this information by going to the navigation drawer in the app and tapping 'About'. If you are building from our codebase instead of downloading the app, please also mention the branch and build variant (e.g. master and prodDebug).
 
 **Screen-shots:** 
 

app/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.5.1'
     implementation 'info.debatty:java-string-similarity:0.24'
     implementation 'com.borjabravo:readmoretextview:2.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.5.0@aar') {
         transitive = true
     }

app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java

@@ -5,6 +5,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import javax.annotation.Nullable;
+
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import io.reactivex.Completable;
 import io.reactivex.Observable;
@@ -31,6 +33,7 @@ public SessionManager(Context context, MediaWikiApi mediaWikiApi, SharedPreferen
     /**
      * @return Account|null
      */
+    @Nullable
     public Account getCurrentAccount() {
         if (currentAccount == null) {
             AccountManager accountManager = AccountManager.get(context);

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

@@ -24,6 +24,7 @@
 import static fr.free.nrw.commons.contributions.Contribution.SOURCE_CAMERA;
 import static fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY;
 import static fr.free.nrw.commons.upload.UploadService.EXTRA_SOURCE;
+import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF;
 
 public class ContributionController {
 
@@ -91,6 +92,7 @@ public void startGalleryPick() {
     }
 
     public void handleImagePicked(int requestCode, Intent data, boolean isDirectUpload, String wikiDataEntityId) {
+        Timber.d("Is direct upload %s and the Wikidata entity ID is %s", isDirectUpload, wikiDataEntityId);
         FragmentActivity activity = fragment.getActivity();
         Timber.d("handleImagePicked() called with onActivityResult()");
         Intent shareIntent = new Intent(activity, ShareActivity.class);
@@ -119,7 +121,7 @@ public void handleImagePicked(int requestCode, Intent data, boolean isDirectUplo
         try {
             shareIntent.putExtra("isDirectUpload", isDirectUpload);
             if (wikiDataEntityId != null && !wikiDataEntityId.equals("")) {
-                shareIntent.putExtra("wikiDataEntityId", wikiDataEntityId);
+                shareIntent.putExtra(WIKIDATA_ENTITY_ID_PREF, wikiDataEntityId);
             }
             activity.startActivity(shareIntent);
         } catch (SecurityException e) {

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

@@ -35,6 +35,7 @@
 
 import static android.app.Activity.RESULT_OK;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF;
 
 public class NearbyListFragment extends DaggerFragment {
     private Bundle bundleForUpdates; // Carry information from activity about changed nearby places and current location
@@ -146,7 +147,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
-            controller.handleImagePicked(requestCode, data, true, directPrefs.getString("WikiDataEntityId", null));
+            controller.handleImagePicked(requestCode, data, true, directPrefs.getString(WIKIDATA_ENTITY_ID_PREF, null));
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);

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

@@ -63,6 +63,7 @@
 
 import static android.app.Activity.RESULT_OK;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF;
 
 public class NearbyMapFragment extends DaggerFragment {
 
@@ -711,15 +712,15 @@ private void passInfoToSheet(Place place) {
 
         fabCamera.setOnClickListener(view -> {
             if (fabCamera.isShown()) {
-                Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
+                Timber.d("Camera button tapped. Place: %s", place.toString());
                 storeSharedPrefs();
                 directUpload.initiateCameraUpload();
             }
         });
 
         fabGallery.setOnClickListener(view -> {
             if (fabGallery.isShown()) {
-                Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
+                Timber.d("Gallery button tapped. Place: %s", place.toString());
                 storeSharedPrefs();
                 directUpload.initiateGalleryUpload();
             }
@@ -731,7 +732,7 @@ void storeSharedPrefs() {
         editor.putString("Title", place.getName());
         editor.putString("Desc", place.getLongDescription());
         editor.putString("Category", place.getCategory());
-        editor.putString("WikiDataEntityId", place.getWikiDataEntityId());
+        editor.putString(WIKIDATA_ENTITY_ID_PREF, place.getWikiDataEntityId());
         editor.apply();
     }
 
@@ -767,7 +768,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
-            controller.handleImagePicked(requestCode, data, true, directPrefs.getString("WikiDataEntityId", null));
+            controller.handleImagePicked(requestCode, data, true, directPrefs.getString(WIKIDATA_ENTITY_ID_PREF, null));
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);

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

@@ -10,6 +10,7 @@
 
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.location.LatLng;
+import timber.log.Timber;
 
 public class Place {
 
@@ -58,10 +59,12 @@ public void setDistance(String distance) {
     @Nullable
     public String getWikiDataEntityId() {
         if (!hasWikidataLink()) {
+            Timber.d("Wikidata entity ID is null for place with sitelink %s", siteLinks.toString());
             return null;
         }
 
         String wikiDataLink = siteLinks.getWikidataLink().toString();
+        Timber.d("Wikidata entity is %s", wikiDataLink);
         return wikiDataLink.replace("http://www.wikidata.org/entity/", "");
     }
 
@@ -94,7 +97,18 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return String.format("Place(%s@%s)", name, location);
+        return "Place{" +
+                "name='" + name + '\'' +
+                ", label='" + label + '\'' +
+                ", longDescription='" + longDescription + '\'' +
+                ", secondaryImageUrl='" + secondaryImageUrl + '\'' +
+                ", location='" + location + '\'' +
+                ", category='" + category + '\'' +
+                ", image='" + image + '\'' +
+                ", secondaryImage=" + secondaryImage +
+                ", distance='" + distance + '\'' +
+                ", siteLinks='" + siteLinks.toString() + '\'' +
+                '}';
     }
 
     /**

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

@@ -58,6 +58,15 @@ private static Uri sanitiseString(String stringUrl) {
         return Uri.parse(sanitisedStringUrl);
     }
 
+    @Override
+    public String toString() {
+        return "Sitelinks{" +
+                "wikipediaLink='" + wikipediaLink + '\'' +
+                ", commonsLink='" + commonsLink + '\'' +
+                ", wikidataLink='" + wikidataLink + '\'' +
+                '}';
+    }
+
     private Sitelinks(Sitelinks.Builder builder) {
         this.wikidataLink = builder.wikidataLink;
         this.wikipediaLink = builder.wikipediaLink;

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

@@ -106,20 +106,20 @@ GPSExtractor processFileCoordinates(boolean gpsEnabled) {
             ParcelFileDescriptor descriptor = contentResolver.openFileDescriptor(mediaUri, "r");
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 if (descriptor != null) {
-                    imageObj = new GPSExtractor(descriptor.getFileDescriptor(), context, prefs);
+                    imageObj = new GPSExtractor(descriptor.getFileDescriptor());
                 }
             } else {
                 String filePath = getPathOfMediaOrCopy();
                 if (filePath != null) {
-                    imageObj = new GPSExtractor(filePath, context, prefs);
+                    imageObj = new GPSExtractor(filePath);
                 }
             }
 
-            decimalCoords = imageObj.getCoords(gpsEnabled);
+            decimalCoords = imageObj.getCoords();
             if (decimalCoords == null || !imageObj.imageCoordsExists) {
                 //Find other photos taken around the same time which has gps coordinates
                 if (!haveCheckedForOtherImages)
-                    findOtherImages(gpsEnabled);// Do not do repeat the process
+                    findOtherImages();// Do not do repeat the process
             } else {
                 useImageCoords();
             }
@@ -137,9 +137,8 @@ String getDecimalCoords() {
     /**
      * Find other images around the same location that were taken within the last 20 sec
      *
-     * @param gpsEnabled True if GPS is enabled
      */
-    private void findOtherImages(boolean gpsEnabled) {
+    private void findOtherImages() {
         Timber.d("filePath" + getPathOfMediaOrCopy());
 
         long timeOfCreation = new File(filePath).lastModified();//Time when the original image was created
@@ -161,17 +160,17 @@ private void findOtherImages(boolean gpsEnabled) {
                 }
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                     if (descriptor != null) {
-                        tempImageObj = new GPSExtractor(descriptor.getFileDescriptor(), context, prefs);
+                        tempImageObj = new GPSExtractor(descriptor.getFileDescriptor());
                     }
                 } else {
                     if (filePath != null) {
-                        tempImageObj = new GPSExtractor(file.getAbsolutePath(), context, prefs);
+                        tempImageObj = new GPSExtractor(file.getAbsolutePath());
                     }
                 }
 
                 if (tempImageObj != null) {
-                    Timber.d("not null fild EXIF" + tempImageObj.imageCoordsExists + " coords" + tempImageObj.getCoords(gpsEnabled));
-                    if (tempImageObj.getCoords(gpsEnabled) != null && tempImageObj.imageCoordsExists) {
+                    Timber.d("not null fild EXIF" + tempImageObj.imageCoordsExists + " coords" + tempImageObj.getCoords());
+                    if (tempImageObj.getCoords() != null && tempImageObj.imageCoordsExists) {
                         // Current image has gps coordinates and it's not current gps locaiton
                         Timber.d("This file has image coords:" + file.getAbsolutePath());
                         SimilarImageDialogFragment newFragment = new SimilarImageDialogFragment();
@@ -250,7 +249,7 @@ void detectUnwantedPictures() {
     @Override
     public void onPositiveResponse() {
         imageObj = tempImageObj;
-        decimalCoords = imageObj.getCoords(false);// Not necessary to use gps as image already ha EXIF data
+        decimalCoords = imageObj.getCoords();// Not necessary to use gps as image already ha EXIF data
         Timber.d("EXIF from tempImageObj");
         useImageCoords();
     }