diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt index 5c2c44ab5..ac7068cc7 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt @@ -153,21 +153,7 @@ after opening the app. } } setUpPager() - /** - * Ask the user for media location access just after login - * so that location in the EXIF metadata of the images shared by the user - * is retained on devices running Android 10 or above - */ -// if (VERSION.SDK_INT >= VERSION_CODES.Q) { -// ActivityCompat.requestPermissions(this, -// new String[]{Manifest.permission.ACCESS_MEDIA_LOCATION}, 0); -// PermissionUtils.checkPermissionsAndPerformAction( -// this, -// () -> {}, -// R.string.media_location_permission_denied, -// R.string.add_location_manually, -// permission.ACCESS_MEDIA_LOCATION); -// } + checkAndResumeStuckUploads() } } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt index 65826a505..a789ef362 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt @@ -70,7 +70,7 @@ class MediaLicenseFragment : UploadBaseFragment(), MediaLicenseContract.View { requireActivity(), getString(R.string.license_step_title), getString(R.string.license_tooltip), - getString(android.R.string.ok), + getString(R.string.ok), null ) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6e76cd25d..6cf6cef75 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -462,7 +462,7 @@ Upload your first media by tapping on the add button. Never ask this again Ask for location permission Ask for location permission when needed for nearby notification card view feature. - Something went wrong, We could not fetch achievements + Something went wrong, and we could not fetch achievements You\'ve made so many contributions our achievements calculation system can\'t cope. This is the ultimate achievement. Ends on: Display campaigns @@ -538,7 +538,7 @@ Upload your first media by tapping on the add button. Examples of good images to upload to Commons Examples of images not to upload Skip this image - Download Failed!!. We cannot download the file without external storage permission. + Download failed. We cannot download the file without external storage permission. Manage EXIF Tags Select which EXIF tags to keep in uploads @@ -551,9 +551,6 @@ Upload your first media by tapping on the add button. Serial Numbers Software - Media location access denied - We may not be able to automatically obtain location data from pictures you upload. Please add the appropriate location for each picture before submitting - Upload photos to Wikimedia Commons directly from your phone. Download the Commons App now: %1$s Share app via... Image Info @@ -671,7 +668,7 @@ Upload your first media by tapping on the add button. 5. Paste the wikitext in the appropriate place. 6. Edit the wikitext for appropriate positioning, if necessary. For more information, see <a href="https://en.wikipedia.org/wiki/Wikipedia:Manual_of_Style/Images#How_to_place_an_image">here</a>. 7. Publish the article - Copy wikicode to clipboard + Copy wikitext to clipboard pause resume Paused