diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 676b7e10..f109adfd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,7 @@ val view = LayoutInflater.from(context) .inflate(R.layout.layout_bubble_toolbar_primary_color, parent, false) - view.findViewById(R.id.theme_toolbar_primary_color).apply { + view.findViewById(R.id.theme_toolbar_primary_color)?.apply { setOnCheckedChangeListener(null) isChecked = appPreferences.toolbarPrimaryColor setOnCheckedChangeListener { _, isChecked -> diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt index 2dfa9520..3b97cd40 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt @@ -225,7 +225,7 @@ open class MainActivity : BaseActivity(), NavigationBarView.OnItemSelectedListen .show() dataStore.putBoolean(SP_SHOULD_SHOW_SNACKBAR, false) } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && AccountUtil.isLoggedIn(this)) { requestPermission { permissions = listOf(PermissionUtils.POST_NOTIFICATIONS) description = getString(R.string.desc_permission_post_notifications)