From de1a3144cc1385b7500bc165ee21117a9d47b5ed Mon Sep 17 00:00:00 2001
From: Dmitry Brant <dbrant@wikimedia.org>
Date: Fri, 26 May 2017 16:38:34 -0400
Subject: [PATCH] Don't pass Activity into WelcomePagerAdapter.

---
 .../fr/free/nrw/commons/WelcomeActivity.java  |  3 +--
 .../free/nrw/commons/WelcomePagerAdapter.java | 21 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
index dab21a6e6..822d7f91a 100644
--- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
@@ -28,8 +28,7 @@ public class WelcomeActivity extends BaseActivity {
     }
 
     private void setUpAdapter() {
-        WelcomePagerAdapter adapter = new WelcomePagerAdapter(this);
-        pager.setAdapter(adapter);
+        pager.setAdapter(new WelcomePagerAdapter());
         indicator.setViewPager(pager);
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
index 6da880694..cb4db4f65 100644
--- a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
@@ -1,7 +1,6 @@
 package fr.free.nrw.commons;
 
 import android.app.Activity;
-import android.content.Context;
 import android.support.v4.view.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,9 +10,6 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 public class WelcomePagerAdapter extends PagerAdapter {
-
-    private Context context;
-
     private static final int PAGE_FINAL = 4;
 
     static final int[] PAGE_LAYOUTS = new int[]{
@@ -24,10 +20,6 @@ public class WelcomePagerAdapter extends PagerAdapter {
             R.layout.welcome_final
     };
 
-    public WelcomePagerAdapter(Context context) {
-        this.context = context;
-    }
-
     @Override
     public int getCount() {
         return PAGE_LAYOUTS.length;
@@ -40,11 +32,11 @@ public class WelcomePagerAdapter extends PagerAdapter {
 
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
-        LayoutInflater inflater = LayoutInflater.from(context);
+        LayoutInflater inflater = LayoutInflater.from(container.getContext());
         ViewGroup layout = (ViewGroup) inflater.inflate(PAGE_LAYOUTS[position], container, false);
 
         if (position == PAGE_FINAL) {
-            ViewHolder holder = new ViewHolder(layout, context);
+            ViewHolder holder = new ViewHolder(layout);
             layout.setTag(holder);
         }
         container.addView(layout);
@@ -57,16 +49,13 @@ public class WelcomePagerAdapter extends PagerAdapter {
     }
 
     public static class ViewHolder {
-        private Context context;
-
-        public ViewHolder(View view, Context context) {
+        public ViewHolder(View view) {
             ButterKnife.bind(this, view);
-            this.context = context;
         }
 
         @OnClick(R.id.welcomeYesButton)
-        void onClicked() {
-            ((Activity) context).finish();
+        void onClicked(View view) {
+            ((Activity) view.getContext()).finish();
         }
     }
 }