From a7da30d01c47fb6167c65eba004e3a36240f1287 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Sun, 20 May 2018 13:02:58 +0300
Subject: [PATCH] Some codes

---
 .../fr/free/nrw/commons/delete/DeleteTask.java  |  1 +
 .../free/nrw/commons/review/ReviewActivity.java | 17 +++++++----------
 .../nrw/commons/review/ReviewController.java    |  5 +----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java
index b4ffe5a33..cea406887 100644
--- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java
+++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java
@@ -196,6 +196,7 @@ public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {
             String reason = input.getText().toString();
 
             ((ReviewActivity)context).reviewController.swipeToNext();
+            ((ReviewActivity)context).runRandomizer();
 
             DeleteTask deleteTask = new DeleteTask(context, media, reason);
             deleteTask.execute();
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 436e13092..dee9fa4ad 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
@@ -1,11 +1,9 @@
 package fr.free.nrw.commons.review;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import android.os.Handler;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.DrawerLayout;
@@ -15,14 +13,12 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.ProgressBar;
 
 import com.viewpagerindicator.CirclePageIndicator;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 
 import javax.inject.Inject;
 
@@ -30,7 +26,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.AuthenticatedActivity;
 import fr.free.nrw.commons.mwapi.MediaResult;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
@@ -53,7 +48,7 @@ public class ReviewActivity extends AuthenticatedActivity {
     DrawerLayout drawerLayout;
 
     @BindView(R.id.reviewPager)
-    ViewPager pager;
+    ViewPager reviewPager;
 
     @Inject MediaWikiApi mwApi;
 
@@ -84,9 +79,9 @@ public class ReviewActivity extends AuthenticatedActivity {
         reviewController = new ReviewController(this);
 
         reviewPagerAdapter = new ReviewPagerAdapter(getSupportFragmentManager());
-        pager.setAdapter(reviewPagerAdapter);
+        reviewPager.setAdapter(reviewPagerAdapter);
         reviewPagerAdapter.getItem(0);
-        pagerIndicator.setViewPager(pager);
+        pagerIndicator.setViewPager(reviewPager);
 
         runRandomizer(); //Run randomizer whenever everything is ready so that a first random image will be added
     }
@@ -109,10 +104,12 @@ public class ReviewActivity extends AuthenticatedActivity {
     }
 
     public boolean runRandomizer() {
-        ProgressBar progressBar = reviewPagerAdapter.reviewImageFragments[pager.getCurrentItem()].progressBar;
+        ProgressBar progressBar = reviewPagerAdapter.reviewImageFragments[reviewPager.getCurrentItem()].progressBar;
         if (progressBar != null) {
             progressBar.setVisibility(View.VISIBLE);
         }
+
+        reviewPager.setCurrentItem(0);
         Observable.fromCallable(() -> {
             Media result = null;
             try {
@@ -137,7 +134,7 @@ public class ReviewActivity extends AuthenticatedActivity {
     private void updateImage(Media result) {
         reviewController.onImageRefreshed(result.getFilename()); //file name is updated
         reviewPagerAdapter.updateFilename();
-        pager.setCurrentItem(0);
+        reviewPager.setCurrentItem(0);
         Observable.fromCallable(() -> {
             MediaResult media = mwApi.fetchMediaByFilename("File:" + result.getFilename());
             return MediaDataExtractorUtil.extractCategories(media.getWikiSource());
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 b6ce80f84..62616190b 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
@@ -5,8 +5,6 @@ import android.support.v4.view.ViewPager;
 
 import java.util.ArrayList;
 
-import javax.inject.Inject;
-
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.delete.DeleteTask;
@@ -25,7 +23,7 @@ public class ReviewController {
     ReviewController(Context context) {
         reviewActivity =  (ReviewActivity)context;
         reviewPagerAdapter = reviewActivity.reviewPagerAdapter;
-        viewPager = ((ReviewActivity)context).pager;
+        viewPager = ((ReviewActivity)context).reviewPager;
     }
 
     public void onImageRefreshed(String fileName) {
@@ -43,7 +41,6 @@ public class ReviewController {
             viewPager.setCurrentItem(nextPos);
         } else {
             reviewActivity.runRandomizer();
-            viewPager.setCurrentItem(0);
         }
     }