Fix story saving for subscriptions and snap maps.

rodit · Jun 2, 2022 · 981c94a · 981c94a
1 parent 2376f40
commit 981c94a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/xyz/rodit/snapmod/features/opera/AutoSaveOption.kt b/app/src/main/java/xyz/rodit/snapmod/features/opera/AutoSaveOption.kt
@@ -13,10 +13,11 @@ class AutoSaveOption(context: FeatureContext) : Contextual(context), MenuPlugin
     override val isEnabled = true
 
     override fun createActions(params: ParamsMap): Collection<OperaActionMenuOptionViewModel> {
-        return setOf(
+        val storyId = params.storyId
+        return if (storyId == null) emptySet() else setOf(
             OperaActionMenuOptionViewModel(
                 0,
-                if (context.autoDownloadStories.isEnabled(params.storyId))
+                if (context.autoDownloadStories.isEnabled(storyId))
                     CustomResources.string.menu_story_disable_auto_download
                 else
                     CustomResources.string.menu_story_enable_auto_download,

diff --git a/app/src/main/java/xyz/rodit/snapmod/features/saving/StoryHelper.kt b/app/src/main/java/xyz/rodit/snapmod/features/saving/StoryHelper.kt
@@ -140,8 +140,12 @@ val ParamsMap.isChat: Boolean
 
 val ParamsMap.storyId: String?
     get() {
-        val reportingInfo = map[FriendStoryKeys.getStorySnapViewReportingInfo().instance]
-        return if (reportingInfo is Collection<*>) StorySnapViewReportingInfo.wrap(reportingInfo.first()).storySnapKey.storyKey.storyId else null
+        return try {
+            val reportingInfo = map[FriendStoryKeys.getStorySnapViewReportingInfo().instance]
+            if (reportingInfo is Collection<*>) StorySnapViewReportingInfo.wrap(reportingInfo.first()).storySnapKey.storyKey.storyId else null
+        } catch (ex: NullPointerException) {
+            null
+        }
     }
 
 class StoryMedia(