From da28d4f945f0d5dca2f1e68b454f5414804aaee0 Mon Sep 17 00:00:00 2001 From: Josephine Lim Date: Mon, 11 Jun 2018 17:29:29 +1000 Subject: [PATCH 1/4] Versioning and changelog for v2.7.2 (#1610) * Versioning for v2.7.2 * Update changelog.md --- CHANGELOG.md | 3 +++ app/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c77174cf..1688b3b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Wikimedia Commons for Android +## v2.7.2 +- Modified subtext for "automatically get current location" setting to emphasize that it will reveal user's location + ## v2.7.1 - Fixed UI and permission issues with Nearby - Fixed issue with My Recent Uploads being empty diff --git a/app/build.gradle b/app/build.gradle index 9300cd9aa..dc8c3b845 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -92,8 +92,8 @@ android { defaultConfig { applicationId 'fr.free.nrw.commons' - versionCode 84 - versionName '2.7.1' + versionCode 85 + versionName '2.7.2' setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) minSdkVersion project.minSdkVersion From 2e9af3c33ad9c6a721df9d6b0f6872479ce73c1e Mon Sep 17 00:00:00 2001 From: nemobis Date: Tue, 12 Jun 2018 22:05:25 +0300 Subject: [PATCH 2/4] Correct name is "Wikidata", not "wiki data" Reported at https://phabricator.wikimedia.org/T196439 --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c0e6fb719..d2acdb245 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -284,7 +284,7 @@ Error fetching nearby places. Image successfully added to %1$s on Wikidata! - Failed to update corresponding wiki data entity! + Failed to update corresponding Wikidata entity! Set wallpaper Wallpaper set successfully! From 1dc0a7c257d9f93162dd90fb4bfe95a09c4e75bb Mon Sep 17 00:00:00 2001 From: Vivek Maskara Date: Thu, 14 Jun 2018 14:42:46 +0530 Subject: [PATCH 3/4] Fix resource not found exception with null checks (#1628) --- .../contributions/ContributionsActivity.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 312839a24..c39fbb06e 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -275,17 +275,25 @@ public class ContributionsActivity .getUploadCount(sessionManager.getCurrentAccount().name) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - uploadCount -> getSupportActionBar().setSubtitle(getResources() - .getQuantityString(R.plurals.contributions_subtitle, - uploadCount, uploadCount)), + .subscribe(this::displayUploadCount, t -> Timber.e(t, "Fetching upload count failed") )); } - public void betaSetUploadCount(int betaUploadCount){ + private void displayUploadCount(Integer uploadCount) { + if (isFinishing() + || getSupportActionBar() == null + || getResources() == null) { + return; + } + getSupportActionBar().setSubtitle(getResources() - .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount)); + .getQuantityString(R.plurals.contributions_subtitle, + uploadCount, uploadCount)); + } + + public void betaSetUploadCount(int betaUploadCount) { + displayUploadCount(betaUploadCount); } From 18b0517fc7390e4ac27a492bdf6ec15ceeebd2c8 Mon Sep 17 00:00:00 2001 From: Vivek Maskara Date: Tue, 19 Jun 2018 13:23:26 +0530 Subject: [PATCH 4/4] Fix crash while uploading image with whitespace title (#1636) --- .../fr/free/nrw/commons/upload/SingleUploadFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index a32fb7b42..a993d59da 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -74,13 +74,13 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment { //What happens when the 'submit' icon is tapped case R.id.menu_upload_single: - if (titleEdit.getText().toString().isEmpty()) { + if (titleEdit.getText().toString().trim().isEmpty()) { Toast.makeText(getContext(), R.string.add_title_toast, Toast.LENGTH_LONG).show(); return false; } - String title = titleEdit.getText().toString(); - String desc = descEdit.getText().toString(); + String title = titleEdit.getText().toString().trim(); + String desc = descEdit.getText().toString().trim(); //Save the title/desc in short-lived cache so next time this fragment is loaded, we can access these prefs.edit()