From 824d6ac05e31a3fa2bf6f2243c1b4b1d377b966e Mon Sep 17 00:00:00 2001
From: Ashish Kumar <ashishkumar468@gmail.com>
Date: Tue, 24 Dec 2019 14:02:56 +0530
Subject: [PATCH 1/4] Bugfix/null revision in review (#3309)

* Fixes #3305
 * Handle null firstRevision

* initialise explanation
---
 .../free/nrw/commons/review/ReviewImageFragment.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
index 5ddfe7d06..f82ebd43a 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
@@ -76,7 +76,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
                 false);
         ButterKnife.bind(this, layoutView);
 
-        String question, explanation, yesButtonText, noButtonText;
+        String question, explanation=null, yesButtonText, noButtonText;
         switch (position) {
             case SPAM:
                 question = getString(R.string.review_spam);
@@ -115,12 +115,17 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
 
                 //Get existing user name if it is already saved using savedInstanceState else get from reviewController
                 if (savedInstanceState == null) {
-                    user = getReviewActivity().reviewController.firstRevision.getUser();
+                    if (getReviewActivity().reviewController != null) {
+                        user = getReviewActivity().reviewController.firstRevision.getUser();
+                    }
                 } else {
                     user = savedInstanceState.getString(SAVED_USER);
                 }
 
-                explanation = getString(R.string.review_thanks_explanation, user);
+                //if the user is null because of whatsoever reason, review will not be sent anyways
+                if (!TextUtils.isEmpty(user)) {
+                    explanation = getString(R.string.review_thanks_explanation, user);
+                }
 
                 yesButtonText = getString(R.string.review_thanks_yes_button_text);
                 noButtonText = getString(R.string.review_thanks_no_button_text);

From 349e51f4a9b259a68da7f0ae4a998e6f8acc318a Mon Sep 17 00:00:00 2001
From: Ashish Kumar <ashishkumar468@gmail.com>
Date: Tue, 24 Dec 2019 14:25:26 +0530
Subject: [PATCH 2/4] Fixes #3307 (#3308)

* Fixed positional argument format for string in "image_uploaded_by"
---
 app/src/main/res/values-th/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 48020b1af..bc573d24c 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -304,7 +304,7 @@
   <string name="showcase_view_whole_nearby_activity">สถานที่เหล่านี้คือสถานที่ที่อยู่ใกล้คุณ และต้องการภาพสำหรับเพิ่มเข้าไปในบทความบนวิกิพีเดีย\n\nกดที่\'{{Wikimedia:Commons-android-strings-search this area}}\'เพื่อดูแผนที่และสำรวจว่าสิ่งใดบ้างที่ต้องการภาพ และถ่ายมันมาหากคุณสะดวก</string>
   <string name="no_images_found">ไม่พบรูปภาพ!</string>
   <string name="error_loading_images">เกิดข้อผิดพลาดระหว่างการโหลดภาะ</string>
-  <string name="image_uploaded_by">อัพโหลดโดย: %1$a</string>
+  <string name="image_uploaded_by">อัพโหลดโดย: %1$s</string>
   <string name="block_notification">คุณกำลังถูกบล็อคไม่ให้แก้ไขคอมมอนส์</string>
   <string name="appwidget_img">รูปภาพประจำวัน</string>
   <string name="app_widget_heading">รูปภาพประจำวัน</string>

From 9c6e33901f157b38204756b06dba82a422ba736f Mon Sep 17 00:00:00 2001
From: Josephine Lim <josephinelim86@gmail.com>
Date: Mon, 20 Jan 2020 00:01:07 +1000
Subject: [PATCH 3/4] Versioning for v2.12.1

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index da9cc98ff..13bad76f0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -103,8 +103,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 508
-        versionName '2.12.0'
+        versionCode 542
+        versionName '2.12.1'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19

From 53d3c37180bbe31ff17b3ec8ec8730eea8349961 Mon Sep 17 00:00:00 2001
From: Josephine Lim <josephinelim86@gmail.com>
Date: Mon, 20 Jan 2020 00:03:05 +1000
Subject: [PATCH 4/4] Update changelog.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 318b29178..d1f1ce3f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Wikimedia Commons for Android
 
+## v2.12.1
+- Fixed issue with Nearby loading in wrong location
+- Various crash fixes
+
 ## v2.12.0
 - Completed codebase overhaul 
 - Added filters for place type and place state to Nearby