From 11563e6f95f0462a1066cc38cbcfec78c3a37e3f Mon Sep 17 00:00:00 2001
From: inorichi <chibilen@gmail.com>
Date: Mon, 16 Nov 2015 21:22:17 +0100
Subject: [PATCH] Fix a leak when rotating screen while reading

---
 .../eu/kanade/mangafeed/ui/reader/ReaderActivity.java     | 3 ---
 .../ui/reader/viewer/common/ViewPagerReaderAdapter.java   | 8 +++-----
 .../ui/reader/viewer/horizontal/HorizontalReader.java     | 6 +++---
 .../ui/reader/viewer/horizontal/RightToLeftReader.java    | 2 +-
 .../ui/reader/viewer/vertical/VerticalReader.java         | 6 +++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderActivity.java b/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderActivity.java
index 5bdab93fd9..7bc07278c4 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderActivity.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderActivity.java
@@ -66,9 +66,6 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
     }
     
     public void onPageListReady(List<Page> pages) {
-        if (viewer != null)
-            viewer.destroySubscriptions();
-        viewer = getViewer();
         viewer.onPageListReady(pages);
         viewer.updatePageNumber();
     }
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/common/ViewPagerReaderAdapter.java b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/common/ViewPagerReaderAdapter.java
index 9d4d2d3feb..52ced5b7a8 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/common/ViewPagerReaderAdapter.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/common/ViewPagerReaderAdapter.java
@@ -11,16 +11,14 @@ public class ViewPagerReaderAdapter extends SmartFragmentStatePagerAdapter {
 
     private List<Page> pages;
 
-    public ViewPagerReaderAdapter(FragmentManager fragmentManager) {
+    public ViewPagerReaderAdapter(FragmentManager fragmentManager, List<Page> pages) {
         super(fragmentManager);
+        this.pages = pages;
     }
 
     @Override
     public int getCount() {
-        if (pages != null)
-            return pages.size();
-
-        return 0;
+        return pages.size();
     }
 
     @Override
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/HorizontalReader.java b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/HorizontalReader.java
index aac13c9613..5d76d5bd38 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/HorizontalReader.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/HorizontalReader.java
@@ -24,8 +24,6 @@ public abstract class HorizontalReader extends BaseReader {
         activity.getLayoutInflater().inflate(R.layout.reader_horizontal, container);
         ButterKnife.bind(this, container);
 
-        adapter = new ViewPagerReaderAdapter(activity.getSupportFragmentManager());
-        viewPager.setAdapter(adapter);
         viewPager.setOffscreenPageLimit(3);
         viewPager.addOnPageChangeListener(new HorizontalViewPager.SimpleOnPageChangeListener() {
             @Override
@@ -60,7 +58,9 @@ public abstract class HorizontalReader extends BaseReader {
 
     @Override
     public void onPageListReady(List<Page> pages) {
-        adapter.setPages(pages);
+        currentPosition = 0;
+        adapter = new ViewPagerReaderAdapter(activity.getSupportFragmentManager(), pages);
+        viewPager.setAdapter(adapter);
     }
 
     @Override
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/RightToLeftReader.java b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/RightToLeftReader.java
index d8327adee3..4cf4d0c4fb 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/RightToLeftReader.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/horizontal/RightToLeftReader.java
@@ -19,7 +19,7 @@ public class RightToLeftReader extends HorizontalReader {
     public void onPageListReady(List<Page> pages) {
         ArrayList<Page> inversedPages = new ArrayList<>(pages);
         Collections.reverse(inversedPages);
-        adapter.setPages(inversedPages);
+        super.onPageListReady(inversedPages);
         viewPager.setCurrentItem(adapter.getCount() - 1, false);
     }
 
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/vertical/VerticalReader.java b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/vertical/VerticalReader.java
index a4969ad4e9..216c8199b8 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/vertical/VerticalReader.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/vertical/VerticalReader.java
@@ -25,8 +25,6 @@ public class VerticalReader extends BaseReader {
         activity.getLayoutInflater().inflate(R.layout.reader_vertical, container);
         ButterKnife.bind(this, container);
 
-        adapter = new ViewPagerReaderAdapter(activity.getSupportFragmentManager());
-        viewPager.setAdapter(adapter);
         viewPager.setOffscreenPageLimit(3);
         viewPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
             @Override
@@ -49,7 +47,9 @@ public class VerticalReader extends BaseReader {
 
     @Override
     public void onPageListReady(List<Page> pages) {
-        adapter.setPages(pages);
+        currentPosition = 0;
+        adapter = new ViewPagerReaderAdapter(activity.getSupportFragmentManager(), pages);
+        viewPager.setAdapter(adapter);
     }
 
     @Override