From 612e73afd4c8a4478924bf10a9c000520913c0d6 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:05:13 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E9=80=82=E9=85=8D=20Android=2013=20?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8B=E6=80=A7=E8=BF=94=E5=9B=9E=E6=89=8B=E5=8A=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                                | 1 +
 .../com/huanchengfly/tieba/post/activities/AppThemeActivity.kt  | 2 +-
 .../java/com/huanchengfly/tieba/post/activities/MainActivity.kt | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

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 @@
 
     <application
         android:name=".BaseApplication"
+        android:enableOnBackInvokedCallback="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_descriptor"
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/AppThemeActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/AppThemeActivity.kt
index a9f544e3..365fefec 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/AppThemeActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/AppThemeActivity.kt
@@ -144,7 +144,7 @@ class AppThemeActivity : BaseActivity() {
                     ChatBubbleStyleAdapter.Bubble { context, _, parent ->
                         val view = LayoutInflater.from(context)
                             .inflate(R.layout.layout_bubble_toolbar_primary_color, parent, false)
-                        view.findViewById<TintSwitch>(R.id.theme_toolbar_primary_color).apply {
+                        view.findViewById<TintSwitch>(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)