Upgrade to nucleus 3

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.kt

@@ -23,21 +23,24 @@ class MangaActivity : BaseRxActivity<MangaPresenter>() {
 
     companion object {
 
-        val FROM_CATALOGUE = "from_catalogue"
-        val INFO_FRAGMENT = 0
-        val CHAPTERS_FRAGMENT = 1
-        val MYANIMELIST_FRAGMENT = 2
+        const val FROM_CATALOGUE_EXTRA = "from_catalogue"
+        const val MANGA_EXTRA = "manga"
+        const val INFO_FRAGMENT = 0
+        const val CHAPTERS_FRAGMENT = 1
+        const val MYANIMELIST_FRAGMENT = 2
 
-        fun newIntent(context: Context, manga: Manga): Intent {
-            val intent = Intent(context, MangaActivity::class.java)
+        fun newIntent(context: Context, manga: Manga, fromCatalogue: Boolean = false): Intent {
             SharedData.put(MangaEvent(manga))
-            return intent
+            return Intent(context, MangaActivity::class.java).apply {
+                putExtra(FROM_CATALOGUE_EXTRA, fromCatalogue)
+                putExtra(MANGA_EXTRA, manga.id)
+            }
         }
     }
 
     private lateinit var adapter: MangaDetailAdapter
 
-    var isCatalogueManga: Boolean = false
+    var fromCatalogue: Boolean = false
         private set
 
     override fun onCreate(savedState: Bundle?) {
@@ -45,16 +48,21 @@ class MangaActivity : BaseRxActivity<MangaPresenter>() {
         super.onCreate(savedState)
         setContentView(R.layout.activity_manga)
 
+        presenter.setMangaEvent(SharedData.getOrPut(MangaEvent::class.java) {
+            val id = intent.getLongExtra(MANGA_EXTRA, 0)
+            MangaEvent(presenter.db.getManga(id).executeAsBlocking()!!)
+        })
+
         setupToolbar(toolbar)
 
-        isCatalogueManga = intent.getBooleanExtra(FROM_CATALOGUE, false)
+        fromCatalogue = intent.getBooleanExtra(FROM_CATALOGUE_EXTRA, false)
 
         adapter = MangaDetailAdapter(supportFragmentManager, this)
         view_pager.adapter = adapter
 
         tabs.setupWithViewPager(view_pager)
 
-        if (!isCatalogueManga)
+        if (!fromCatalogue)
             view_pager.currentItem = CHAPTERS_FRAGMENT
 
         requestPermissionsOnMarshmallow()
@@ -72,7 +80,7 @@ class MangaActivity : BaseRxActivity<MangaPresenter>() {
 
         init {
             pageCount = 2
-            if (!activity.isCatalogueManga && activity.presenter.syncManager.myAnimeList.isLogged)
+            if (!activity.fromCatalogue && activity.presenter.syncManager.myAnimeList.isLogged)
                 pageCount++
         }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt

@@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.event.MangaEvent
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import eu.kanade.tachiyomi.util.SharedData
 import rx.Observable
+import rx.Subscription
 import javax.inject.Inject
 
 /**
@@ -31,37 +32,21 @@ class MangaPresenter : BasePresenter<MangaActivity>() {
      */
     lateinit var manga: Manga
 
-    /**
-     * Key to save and restore [manga] from a bundle.
-     */
-    private val MANGA_KEY = "manga_key"
+    var mangaSubscription: Subscription? = null
 
     override fun onCreate(savedState: Bundle?) {
         super.onCreate(savedState)
 
-        if (savedState == null) {
-            manga = SharedData.get(MangaEvent::class.java)!!.manga
-        } else {
-            manga = savedState.getSerializable(MANGA_KEY) as Manga
-            SharedData.put(MangaEvent(manga))
-        }
-
         // Prepare a subject to communicate the chapters and info presenters for the chapter count.
         SharedData.put(ChapterCountEvent())
-
-        Observable.just(manga)
-                .subscribeLatestCache({ view, manga -> view.onSetManga(manga) })
     }
 
-    override fun onDestroy() {
-        SharedData.remove(MangaEvent::class.java)
-        SharedData.remove(ChapterCountEvent::class.java)
-        super.onDestroy()
-    }
-
-    override fun onSave(state: Bundle) {
-        state.putSerializable(MANGA_KEY, manga)
-        super.onSave(state)
+    fun setMangaEvent(event: MangaEvent) {
+        if (isUnsubscribed(mangaSubscription)) {
+            manga = event.manga
+            mangaSubscription = Observable.just(manga)
+                    .subscribeLatestCache({ view, manga -> view.onSetManga(manga) })
+        }
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt

@@ -181,11 +181,10 @@ class ChaptersFragment : BaseRxFragment<ChaptersPresenter>(), ActionMode.Callbac
     }
 
     val isCatalogueManga: Boolean
-        get() = (activity as MangaActivity).isCatalogueManga
+        get() = (activity as MangaActivity).fromCatalogue
 
     fun openChapter(chapter: Chapter, hasAnimation: Boolean = false) {
-        presenter.onOpenChapter(chapter)
-        val intent = ReaderActivity.newIntent(activity)
+        val intent = ReaderActivity.newIntent(activity, presenter.manga, chapter)
         if (hasAnimation) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
         }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt

@@ -159,10 +159,6 @@ class ChaptersPresenter : BasePresenter<ChaptersFragment>() {
             refreshChapters()
     }
 
-    fun onOpenChapter(chapter: Chapter) {
-        SharedData.put(ReaderEvent(manga, chapter))
-    }
-
     fun getNextUnreadChapter(): Chapter? {
         return db.getNextUnreadChapter(manga).executeAsBlocking()
     }