修复下载npe

cookie登陆时若格式错误，进行提示修复阅读页面部分异常
jiangtian616 · Jul 23, 2022 · 7d2c127 · 7d2c127
1 parent 9c8c69f
commit 7d2c127
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/lib/src/pages/read/read_page_logic.dart b/lib/src/pages/read/read_page_logic.dart
@@ -522,9 +522,14 @@ class ReadPageLogic extends GetxController {
   /// for some reason like slow loading of some image, [ItemPositions] may be not in index order, and even some of
   /// them are not in viewport
   List<ItemPosition> _filterAndSortItems(Iterable<ItemPosition> positions) {
-    positions = positions.where((item) => !(item.itemTrailingEdge < 0 || item.itemLeadingEdge > 1)).toList();
-    (positions as List<ItemPosition>).sort((a, b) => a.index - b.index);
-    return positions;
+    List<ItemPosition> actualPositions = positions.where((item) => !(item.itemTrailingEdge < 0 || item.itemLeadingEdge > 1)).toList();
+    actualPositions.sort((a, b) => a.index - b.index);
+
+    if (actualPositions.isEmpty) {
+      Log.upload(StateError('NoItemPosition!'), stackTrace: StackTrace.current, extraInfos: {'positions': positions});
+    }
+
+    return actualPositions;
   }
 
   double _getVisibleHeight() {

diff --git a/lib/src/pages/setting/account/login/login_page_logic.dart b/lib/src/pages/setting/account/login/login_page_logic.dart
@@ -103,8 +103,18 @@ class LoginPageLogic extends GetxController {
       return;
     }
 
-    int ipbMemberId = int.parse(match.group(1)!);
-    String ipbPassHash = match.group(2)!;
+    int ipbMemberId;
+    String ipbPassHash;
+    try {
+      ipbMemberId = int.parse(match.group(1)!);
+      ipbPassHash = match.group(2)!;
+    } on Exception catch (e) {
+      Log.error('loginFail'.tr, e);
+      Log.upload(e);
+      snack('loginFail'.tr, 'cookieFormatError'.tr);
+      return;
+    }
+
     await cookieManager.storeEhCookiesForAllUri([
       Cookie('ipb_member_id', ipbMemberId.toString()),
       Cookie('ipb_pass_hash', ipbPassHash),

diff --git a/lib/src/service/gallery_download_service.dart b/lib/src/service/gallery_download_service.dart
@@ -807,7 +807,9 @@ class GalleryDownloadService extends GetxController {
   }
 
   bool _taskHasBeenPausedOrRemoved(GalleryDownloadedData gallery) {
-    return gid2DownloadProgress[gallery.gid] == null || gid2DownloadProgress[gallery.gid]!.downloadStatus == DownloadStatus.paused;
+    return gid2DownloadProgress[gallery.gid] == null ||
+        gid2DownloadProgress[gallery.gid]!.downloadStatus == DownloadStatus.paused ||
+        gid2ImageHrefs[gallery.gid] == null;
   }
 
   static void ensureDownloadDirExists() {