Merge branch 'commons-app:master' into get_content_photo_picker

Author: RitikaPahwa4444

docs.html

@@ -38,15 +38,18 @@ <h2 id="language-fallback"><a href="#language-fallback">Why am I seeing foreign
         <p>When a label, caption or description is not available in your language, the app falls back to another language. We consider it is better than showing nothing. For instance, a person whose phone is in Hindi might be happy to see English descriptions of items for which a Hindi description is not available.</p>
         <p>Of course, you are more than welcome to contribute labels and descriptions in your language. To do so, please tap the Wikidata barcode icon in Nearby, or "View file page", or "View item page". This will open the website where translations can be contributed. Thanks a lot!</p>
 
-        <h2 id="geotagging"><a href="#geotagging">Geotagging (adding location data to pictures)</a></h2>
-        <p>Pictures with geolocation data are much more valuable, so please:</p>
+        <h2 id="geotagging"><a href="#geotagging">Location</a></h2>
+        <p>Pictures with geolocation data are much more valuable, so please enable geotagging in your camera app. Here is how to do on Pixel phones: tap on the settings button at the bottom-left of the camera main screen, tap "More settings", enable "Save location". In other camera apps it may be  labelled <b>Location (tags)</b> or <b>GPS (tags)</b>.</p>
+        <p>If your phone's GPS is slow to start, before taking pictures considering launching the free <a href="https://play.google.com/store/apps/details?id=com.silentlexx.gpslock">GPS Locker</a> app. It will prevent the GPS from going to sleep. Please be aware that it consumes battery power, though.</p>
+        <p>If the Commons app tells you that pictures do not have location, even though you took them after enabling location in your camera app, then follow these steps:</p>
         <ol>
-            <li>Enable geotagging in your camera app (often labelled: <b>GPS (tags)</b> , <b>Location (tags)</b> , or <b>save location</b>  and with an icon of a map pin marker)</li>
-            <li>To improve location accuracy, before taking pictures launch the free <a href="https://play.google.com/store/apps/details?id=com.silentlexx.gpslock">GPS Locker</a> app.</li>
-            <li>You can use an app such as <a href="https://play.google.com/store/apps/details?id=eu.bischofs.photomap">PhotoMap</a> to check whether the pictures you take are correctly geolocalized or not.</li>
-            <li>You can manually add or edit the location of your photos using <a href="https://play.google.com/store/apps/details?id=com.tappytaps.android.geotagphotospro2">Geotag Photos Pro</a>.</li>
+            <li>In the Commons Android app's settings, enable "Use document based photo picker".</li>
+            <li>Install an EXIF viewer app and check whether the pictures actually have location or not. Some galleries also can show a map if location is present, for instance on the Google Photos app this is achieved by swiping up. If there is no location, try a different camera app.</li>
+            <li>If that does not fix the issue, try uninstalling and reinstalling the Commons Android app.</li>
+            <li>If that still does not fix the issue, try resetting cache and storage of both your camera app and your gallery app. Do not forget to turn on "save location" on the camera app.</li>
         </ol>
-
+        <p>Even if you add location to a picture in Google Photos, that location is not readable by other apps such as Commons (see the "Share a photo with a location" section of <a href="https://support.google.com/photos/answer/6153599">this Google Photos Help Center article</a>).</p>
+        
         <h2 id="need-to-be-anonymous"><a href="#need-to-be-anonymous">Need to be anonymous?</a></h2>
         <p>Pictures you upload may lead to your identity. Let's say you live under a dictatorship and take a picture revealing leaders corruption: you want to upload the picture to Commons but you probably do not want to be identified as the photographer or as the uploader. Below are a few steps you can take to reduce the risks of being identified, but remember that zero risk does not exist.</p>
         <ol>