From bac8265ce31fd811fe10ecc810b30d983ee07c7e Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 9 Jul 2020 08:14:44 +0200 Subject: [PATCH] Revert "Prevent crash" This reverts commit b7dba612ba535362f96fe9da4079185a3aeab0c5. --- .../main/java/androidx/paging/PagedStorage.java | 6 +----- patches/Paging.patch | 17 ----------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 patches/Paging.patch diff --git a/app/src/main/java/androidx/paging/PagedStorage.java b/app/src/main/java/androidx/paging/PagedStorage.java index 500957ae78..c644234c7e 100644 --- a/app/src/main/java/androidx/paging/PagedStorage.java +++ b/app/src/main/java/androidx/paging/PagedStorage.java @@ -542,11 +542,7 @@ final class PagedStorage extends AbstractList { // OK only if existing single page, and it's the last one if (!onlyEndPagePresent && !addingLastPage) { - eu.faircode.email.Log.e("Insert page" + - " size=" + newPageSize + "/" + mPageSize + - " last=" + addingLastPage + " only=" + onlyEndPagePresent); - return; - //throw new IllegalArgumentException("page introduces incorrect tiling"); + throw new IllegalArgumentException("page introduces incorrect tiling"); } if (onlyEndPagePresent) { mPageSize = newPageSize; diff --git a/patches/Paging.patch b/patches/Paging.patch deleted file mode 100644 index 7cdf008ba8..0000000000 --- a/patches/Paging.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/app/src/main/java/androidx/paging/PagedStorage.java b/app/src/main/java/androidx/paging/PagedStorage.java -index c644234c7..500957ae7 100644 ---- a/app/src/main/java/androidx/paging/PagedStorage.java -+++ b/app/src/main/java/androidx/paging/PagedStorage.java -@@ -542,7 +542,11 @@ final class PagedStorage extends AbstractList { - - // OK only if existing single page, and it's the last one - if (!onlyEndPagePresent && !addingLastPage) { -- throw new IllegalArgumentException("page introduces incorrect tiling"); -+ eu.faircode.email.Log.e("Insert page" + -+ " size=" + newPageSize + "/" + mPageSize + -+ " last=" + addingLastPage + " only=" + onlyEndPagePresent); -+ return; -+ //throw new IllegalArgumentException("page introduces incorrect tiling"); - } - if (onlyEndPagePresent) { - mPageSize = newPageSize;