From 1183476bcad097ebf773b864b5a5a5b003c22788 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Sun, 20 May 2018 15:35:51 +0300
Subject: [PATCH] try to add username and filename

---
 .../fr/free/nrw/commons/review/ReviewActivity.java  |  8 ++++++++
 .../free/nrw/commons/review/ReviewController.java   |  6 ------
 .../nrw/commons/review/ReviewImageFragment.java     | 13 ++++++-------
 app/src/main/res/layout/fragment_review_image.xml   |  3 +--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index 7de3f1f08..f9921ec5a 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -149,6 +149,14 @@ public class ReviewActivity extends AuthenticatedActivity {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::updateCategories, this::categoryFetchError);
+
+        mwApi.firstRevisionOfFile("File:" + fileName).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(revision -> {
+                    ReviewController.firstRevision = revision;
+                    ((ReviewImageFragment)reviewPagerAdapter.getItem(reviewPager.getCurrentItem())).updateImageCaption();
+                });
+
     }
 
     private void categoryFetchError(Throwable throwable) {
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
index 34765d012..7680809c9 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
@@ -33,12 +33,6 @@ public class ReviewController {
     public void onImageRefreshed(String fileName) {
         ReviewController.fileName = fileName;
         ReviewController.categories = new ArrayList<>();
-
-        reviewActivity.mwApi.firstRevisionOfFile("File:" + fileName).subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(revision -> {
-                    ReviewController.firstRevision = revision;
-                });
     }
 
     public void onCategoriesRefreshed(ArrayList<String> categories) {
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 36f48793b..6b5e75fb0 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
@@ -1,27 +1,20 @@
 package fr.free.nrw.commons.review;
 
-import android.app.AlertDialog;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.TableLayout;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 
-import java.util.ArrayList;
-
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.utils.ViewUtil;
 
 /**
  * Created by root on 19.05.2018.
@@ -39,6 +32,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
         private String catString;
 
         private View textViewQuestionContext;
+        private View imageCaption;
         private View textViewQuestion;
         private SimpleDraweeView simpleDraweeView;
 
@@ -85,6 +79,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
             progressBar = layoutView.findViewById(R.id.progressBar);
             textViewQuestion = layoutView.findViewById(R.id.reviewQuestion);
             textViewQuestionContext = layoutView.findViewById(R.id.reviewQuestionContext);
+            imageCaption = layoutView.findViewById(R.id.imageCaption);
             yesButton = layoutView.findViewById(R.id.yesButton);
             noButton = layoutView.findViewById(R.id.noButton);
             String question, explanation;
@@ -138,4 +133,8 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
             }
             return layoutView;
         }
+
+        public void updateImageCaption() {
+            ((TextView)imageCaption).setText(fileName+" is uploaded by: "+ReviewController.firstRevision.username);
+        }
 }
diff --git a/app/src/main/res/layout/fragment_review_image.xml b/app/src/main/res/layout/fragment_review_image.xml
index 58efa4189..a23857330 100644
--- a/app/src/main/res/layout/fragment_review_image.xml
+++ b/app/src/main/res/layout/fragment_review_image.xml
@@ -31,10 +31,9 @@
             >
 
             <TextView
-                android:id="@+id/uploadTitle"
+                android:id="@+id/imageCaption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Testingg"
                 android:textColor="#FFFFFFFF"
                 style="?android:textAppearanceMedium"
                 />