From 9693a597c8444a1537906d9337a9abe3d26cab4e Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Tue, 31 Dec 2024 18:04:30 +0700
Subject: [PATCH] MoreDialogFragment: Better null-safety and localization for
 account header

In case AuthData has expired and user is inside Aurora Store, MoreDialogFragment
will keep crashing while trying to load account name and email.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../aurora/store/view/ui/commons/MoreDialogFragment.kt | 10 ++++++----
 app/src/main/res/values/strings.xml                    |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/MoreDialogFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/MoreDialogFragment.kt
index 3e358b7e4..e8e5199ce 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/MoreDialogFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/MoreDialogFragment.kt
@@ -261,9 +261,10 @@ class MoreDialogFragment : DialogFragment() {
                 ) {
                     Text(
                         text = if (authProvider.isAnonymous) {
-                            "Anonymous"
+                            stringResource(R.string.account_anonymous)
                         } else {
-                            authProvider.authData!!.userProfile!!.name
+                            authProvider.authData?.userProfile?.name
+                                ?: stringResource(R.string.status_unavailable)
                         },
                         fontWeight = FontWeight.Normal,
                         color = onBackgroundColor,
@@ -273,9 +274,10 @@ class MoreDialogFragment : DialogFragment() {
                     )
                     Text(
                         text = if (authProvider.isAnonymous) {
-                            "anonymous@gmail.com"
+                            stringResource(R.string.account_anonymous_email)
                         } else {
-                            authProvider.authData!!.userProfile!!.email
+                            authProvider.authData?.userProfile?.email
+                                ?: stringResource(R.string.status_unavailable)
                         },
                         fontWeight = FontWeight.Light,
                         color = onBackgroundColor,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 324139411..90e31a3e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -413,6 +413,7 @@
     <!-- MoreDialogFragment -->
     <string name="title_more">More</string>
     <string name="manage_account">Manage your account</string>
+    <string name="account_anonymous_email" translatable="false">anonymous@gmail.com</string>
 
     <!-- InstallationPreference -->
     <string name="pref_clear_device_owner_title">Clear device owner</string>