From 78a2eae71999cc8f77a680985fb6f0a7863cc928 Mon Sep 17 00:00:00 2001
From: inorichi <chibilen@gmail.com>
Date: Sat, 30 Jan 2016 00:41:39 +0100
Subject: [PATCH] Minor changes

---
 .../tachiyomi/{ => data}/io/IOHandler.java    |  2 +-
 .../ui/manga/info/MangaInfoFragment.java      | 41 +++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)
 rename app/src/main/java/eu/kanade/tachiyomi/{ => data}/io/IOHandler.java (99%)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/io/IOHandler.java b/app/src/main/java/eu/kanade/tachiyomi/data/io/IOHandler.java
similarity index 99%
rename from app/src/main/java/eu/kanade/tachiyomi/io/IOHandler.java
rename to app/src/main/java/eu/kanade/tachiyomi/data/io/IOHandler.java
index 6ed4f83af..099809986 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/io/IOHandler.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/io/IOHandler.java
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.io;
+package eu.kanade.tachiyomi.data.io;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java
index ffa9e1ee5..3d2eaa133 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java
@@ -27,7 +27,7 @@ import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.cache.CoverCache;
 import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.data.source.base.Source;
-import eu.kanade.tachiyomi.io.IOHandler;
+import eu.kanade.tachiyomi.data.io.IOHandler;
 import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment;
 import eu.kanade.tachiyomi.util.ToastUtil;
 import nucleus.factory.RequiresPresenter;
@@ -35,7 +35,6 @@ import nucleus.factory.RequiresPresenter;
 @RequiresPresenter(MangaInfoPresenter.class)
 public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
 
-    private static final int REQUEST_IMAGE_OPEN = 101;
     @Bind(R.id.swipe_refresh) SwipeRefreshLayout swipeRefresh;
     @Bind(R.id.manga_artist) TextView artist;
     @Bind(R.id.manga_author) TextView author;
@@ -48,6 +47,8 @@ public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
     @Bind(R.id.action_favorite) Button favoriteBtn;
     @Bind(R.id.fab_edit) FloatingActionButton fabEdit;
 
+    private static final int REQUEST_IMAGE_OPEN = 101;
+
     public static MangaInfoFragment newInstance() {
         return new MangaInfoFragment();
     }
@@ -71,11 +72,11 @@ public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
                 .color(ContextCompat.getColor(this.getContext(), R.color.white))
                 .sizeDp(24);
 
-        // Update image of fab buttons
+        // Update image of fab button
         fabEdit.setImageDrawable(edit);
 
         // Set listener.
-        fabEdit.setOnClickListener(v -> MangaInfoFragment.this.selectImage());
+        fabEdit.setOnClickListener(v -> selectImage());
 
         favoriteBtn.setOnClickListener(v -> getPresenter().toggleFavorite());
 
@@ -150,27 +151,25 @@ public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
 
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_IMAGE_OPEN) {
+            // Get the file's content URI from the incoming Intent
+            Uri selectedImageUri = data.getData();
 
-    @Override public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode == Activity.RESULT_OK) {
-            if (requestCode == REQUEST_IMAGE_OPEN) {
-                // Get the file's content URI from the incoming Intent
-                Uri selectedImageUri = data.getData();
+            // Convert to absolute path to prevent FileNotFoundException
+            String result = IOHandler.getFilePath(selectedImageUri,
+                    getContext().getContentResolver(), getContext());
 
-                // Convert to absolute path to prevent FileNotFoundException
-                String result = IOHandler.getFilePath(selectedImageUri, this.getContext().getContentResolver(), this.getContext());
+            // Get file from filepath
+            File picture = new File(result != null ? result : "");
 
-                // Get file from filepath
-                File picture = new File(result != null ? result : "");
+            try {
+                // Update cover to selected file
+                getPresenter().editCoverWithLocalFile(picture, cover);
 
-
-                try {
-                    // Update cover to selected file
-                    getPresenter().editCoverWithLocalFile(picture, cover);
-
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+            } catch (IOException e) {
+                e.printStackTrace();
             }
         }
     }