From 7dcf2376a6fc83cd40e4eef0eec4ec56596ac0d5 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 29 May 2018 18:36:37 +1000
Subject: [PATCH] Rearrange member vars and method params in Zoom.java

---
 .../free/nrw/commons/upload/ShareActivity.java  | 17 +++++++----------
 .../java/fr/free/nrw/commons/upload/Zoom.java   |  8 ++------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index 452c9b3d2..d405c095f 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -497,9 +497,8 @@ public class ShareActivity
         return super.onOptionsItemSelected(item);
     }
 
-    //TODO: Move this to a new class. Save references to the findViewByIds and pass them to the new method
-    /*
-     * function to provide pinch zoom
+    /**
+     * Allows zooming in to the uploaded image. Called when zoom FAB is tapped
      */
     private void zoomImageFromThumb(final View thumbView, Uri imageuri) {
         // If there's an animation in progress, cancel it immediately and proceed with this one.
@@ -511,15 +510,14 @@ public class ShareActivity
         mainFab.setVisibility(View.GONE);
 
         InputStream input = null;
-
         try {
             input = this.getContentResolver().openInputStream(imageuri);
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         }
 
-        Zoom zoomObj = new Zoom(thumbView, flContainer, input, imageuri, this.getContentResolver());
-        Bitmap scaledImage = zoomObj.createScaledImage();
+        Zoom zoomObj = new Zoom(thumbView, flContainer, this.getContentResolver());
+        Bitmap scaledImage = zoomObj.createScaledImage(input, imageuri);
 
         // Load the high-resolution "zoomed-in" image.
         expandedImageView.setImageBitmap(scaledImage);
@@ -569,8 +567,8 @@ public class ShareActivity
         startScaleFinal = startScale;
     }
 
-    /*
-     * called when upper arrow floating button
+    /**
+     * Called when user taps the ^ FAB button, expands to show Zoom and Map
      */
     @OnClick(R.id.main_fab)
     public void onMainFabClicked() {
@@ -583,11 +581,10 @@ public class ShareActivity
 
     @OnClick(R.id.media_upload_zoom_in)
     public void onZoomInFabClicked() {
-        //This try catch block was originally holding the entire click listener on the fab button, I did not wanted to risk exceptions
         try {
             zoomImageFromThumb(backgroundImageView, mediaUri);
         } catch (Exception e) {
-            Log.i("exception", e.toString());
+            Timber.e(e);
         }
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java b/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java
index bda3c2ad5..4bcd23a53 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java
@@ -20,20 +20,16 @@ import timber.log.Timber;
 public class Zoom {
 
     private View thumbView;
-    private InputStream input;
-    private Uri imageUri;
     private ContentResolver contentResolver;
     private FrameLayout flContainer;
 
-    Zoom(View thumbView, FrameLayout flContainer, InputStream input, Uri imageUri, ContentResolver contentResolver) {
+    Zoom(View thumbView, FrameLayout flContainer, ContentResolver contentResolver) {
         this.thumbView = thumbView;
-        this.input = input;
-        this.imageUri = imageUri;
         this.contentResolver = contentResolver;
         this.flContainer = flContainer;
     }
 
-    Bitmap createScaledImage() {
+    Bitmap createScaledImage(InputStream input, Uri imageUri) {
 
         Bitmap scaled = null;
         BitmapRegionDecoder decoder = null;