From 01175e687c4a63df62e8a6a096dcd77a217ddbec Mon Sep 17 00:00:00 2001
From: jobobby04 <jobobby04@users.noreply.github.com>
Date: Fri, 17 Apr 2020 00:28:35 -0400
Subject: [PATCH] Another fix for mass migration

Also fixing some deprecated code

(cherry picked from commit 2535ea92ebc97bad9f30e9e48493629df6db28a3)
---
 .../manga/process/MigrationListController.kt  | 10 +++++---
 .../manga/process/MigrationProcessAdapter.kt  |  2 +-
 .../layout/global_search_controller_card.xml  | 12 +++++-----
 .../global_search_controller_card_item.xml    | 23 ++++++++++---------
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
index 174179dbd..7b9f1399a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
@@ -163,8 +163,10 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
                                                 val localManga = smartSearchEngine.networkToLocalManga(searchResult, source.id)
                                                 val chapters = source.fetchChapterList(localManga).toSingle().await(
                                                     Schedulers.io())
-                                                withContext(Dispatchers.IO) {
+                                                try {
                                                     syncChaptersWithSource(db, chapters, localManga, source)
+                                                } catch (e: Exception) {
+                                                    return@async null
                                                 }
                                                 manga.progress.send(validSources.size to processedSources.incrementAndGet())
                                                 localManga to chapters.size
@@ -260,8 +262,10 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
     }
 
     override fun noMigration() {
-        activity?.toast(R.string.no_migrations)
-        router.popCurrentController()
+        launchUI {
+            activity?.toast(R.string.no_migrations)
+            router.popCurrentController()
+        }
     }
 
     override fun onMenuItemClick(position: Int, item: MenuItem) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt
index 2ee1bfc69..19079e505 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt
@@ -39,7 +39,7 @@ class MigrationProcessAdapter(
     }
 
     fun sourceFinished() {
-        if (mangasSkipped() == itemCount || itemCount == 0) menuItemListener.noMigration()
+        if (itemCount == 0) menuItemListener.noMigration()
         if (allMangasDone()) menuItemListener.enableButtons()
     }
 
diff --git a/app/src/main/res/layout/global_search_controller_card.xml b/app/src/main/res/layout/global_search_controller_card.xml
index adf5718f1..d40d6e06b 100644
--- a/app/src/main/res/layout/global_search_controller_card.xml
+++ b/app/src/main/res/layout/global_search_controller_card.xml
@@ -8,12 +8,12 @@
     <TextView
         android:id="@+id/title"
         style="@style/TextAppearance.Regular.SubHeading"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:padding="@dimen/material_component_text_fields_padding_above_and_below_label"
         app:layout_constraintBottom_toTopOf="@+id/source_card"
-        app:layout_constraintHeight_default="wrap"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Title" />
 
@@ -32,11 +32,11 @@
         android:id="@+id/source_card"
         style="@style/Theme.Widget.CardView.Item"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:minHeight="144dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_default="wrap"
+        app:layout_constrainedHeight="true"
         app:layout_constraintStart_toStartOf="parent">
 
         <ProgressBar
diff --git a/app/src/main/res/layout/global_search_controller_card_item.xml b/app/src/main/res/layout/global_search_controller_card_item.xml
index 54e2332b3..396327662 100644
--- a/app/src/main/res/layout/global_search_controller_card_item.xml
+++ b/app/src/main/res/layout/global_search_controller_card_item.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/list_item_selector"
     android:orientation="vertical"
-    android:paddingStart="4dp"
-    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
     android:paddingEnd="4dp"
-    android:paddingBottom="8dp">
+    android:paddingStart="4dp"
+    android:paddingTop="8dp">
 
     <ProgressBar
         android:id="@+id/progress"
         style="?android:attr/progressBarStyleSmall"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:visibility="gone"
+        app:layout_constrainedHeight="true"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_default="wrap"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_default="wrap" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/itemImage"
@@ -40,13 +41,13 @@
         android:id="@+id/tvTitle"
         style="@style/TextAppearance.Regular.Caption"
         android:layout_width="104dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="0dp"
         android:ellipsize="end"
         android:gravity="center"
         android:maxLines="1"
+        app:layout_constrainedHeight="true"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_default="wrap"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/itemImage"
         tools:text="Sample title" />