fix: GroupPagerAdapter crash

sibalma · May 15, 2023 · 11ecdba · 11ecdba
1 parent 7fa7190
commit 11ecdba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt
@@ -1079,16 +1079,18 @@ class ConfigurationFragment @JvmOverloads constructor(
                     }
                 }
 
-                val runFunc = if (now) requireActivity()::runOnUiThread else groupPager::post
-                runFunc {
-                    groupList = newGroupList
-                    notifyDataSetChanged()
-                    if (set) groupPager.setCurrentItem(selectedGroupIndex, false)
-                    val hideTab = groupList.size < 2
-                    tabLayout.isGone = hideTab
-                    toolbar.elevation = if (hideTab) 0F else dp2px(4).toFloat()
-                    if (!select) {
-                        groupPager.registerOnPageChangeCallback(updateSelectedCallback)
+                val runFunc = if (now) activity?.let { it::runOnUiThread } else groupPager::post
+                if (runFunc != null) {
+                    runFunc {
+                        groupList = newGroupList
+                        notifyDataSetChanged()
+                        if (set) groupPager.setCurrentItem(selectedGroupIndex, false)
+                        val hideTab = groupList.size < 2
+                        tabLayout.isGone = hideTab
+                        toolbar.elevation = if (hideTab) 0F else dp2px(4).toFloat()
+                        if (!select) {
+                            groupPager.registerOnPageChangeCallback(updateSelectedCallback)
+                        }
                     }
                 }
             }

diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/ProfileSettingsActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/ProfileSettingsActivity.kt
@@ -285,7 +285,7 @@ abstract class ProfileSettingsActivity<T : AbstractBean>(
                         .setLongLabel(ent.displayName())
                         .setIcon(
                             IconCompat.createWithResource(
-                                ctx,
+                                activity,
                                 R.drawable.ic_qu_shadowsocks_launcher
                             )
                         )
@@ -298,7 +298,7 @@ abstract class ProfileSettingsActivity<T : AbstractBean>(
                             }
                         )
                         .build()
-                ShortcutManagerCompat.requestPinShortcut(ctx, shortcut, null)
+                ShortcutManagerCompat.requestPinShortcut(activity, shortcut, null)
             }
 
             R.id.action_move -> {