From 7475215d446ee8291a9dd2e6caa87f0a143905d8 Mon Sep 17 00:00:00 2001
From: heyethereum <heyethereum@gmail.com>
Date: Wed, 21 Aug 2024 22:06:16 +0800
Subject: [PATCH] hide email section for defaultUser

---
 android/app/release/output-metadata.json |  20 ++++++++++
 android/keystore                         | Bin 0 -> 2676 bytes
 screens/SettingsScreen.tsx               |  48 +++++++++++++----------
 3 files changed, 48 insertions(+), 20 deletions(-)
 create mode 100644 android/app/release/output-metadata.json
 create mode 100644 android/keystore

diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json
new file mode 100644
index 0000000..cd3757f
--- /dev/null
+++ b/android/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.safeqr.safeqr",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/android/keystore b/android/keystore
new file mode 100644
index 0000000000000000000000000000000000000000..2f1222dd9e986f4ae9a657441cf0252a4d884a87
GIT binary patch
literal 2676
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
K^3Z{QMabW@n9S<{

literal 0
HcmV?d00001

diff --git a/screens/SettingsScreen.tsx b/screens/SettingsScreen.tsx
index 69ba4a3..f1d0013 100644
--- a/screens/SettingsScreen.tsx
+++ b/screens/SettingsScreen.tsx
@@ -16,7 +16,7 @@ const handleSignInWithRedirect = async () => {
   try {
     await signInWithRedirect();
   } catch (error) {
-    console.error('Error during sign in:', error);
+    console.log('Error during sign in:', error);
   }
 };
 
@@ -24,14 +24,18 @@ const SettingsScreen: React.FC = () => {
   const { userAttributes } = useFetchUserAttributes();
   const [googleAccessToken, setGoogleAccessToken] = useState<string | null>(null);
   const [userEmail, setUserEmail] = useState<string | null>(null);
+  const [userSource, setUserSource] = useState<string | null>(null);
 
   const fetchUserEmail = async () => {
     try {
       console.log('fetchUserEmail triggered');
       const userInfo = await getUserInfo();
+      console.log("User Source: ", userInfo.source);
+      
+      setUserSource(userInfo.source)
       setUserEmail(userInfo.email); // Assuming userInfo has an email property
     } catch (error) {
-      console.error('Error fetching user email:', error);
+      console.log('Error fetching user email:', error);
     }
   };
 
@@ -64,8 +68,8 @@ const SettingsScreen: React.FC = () => {
           try {
             parsedPayload = JSON.parse(decodedPayload);
           } catch (parseError) {
-            console.error('Error parsing payload:', parseError);
-            console.error(`Parse error: ${parseError.message}\nPayload: ${decodedPayload}`);
+            console.log('Error parsing payload:', parseError);
+            console.log(`Parse error: ${parseError.message}\nPayload: ${decodedPayload}`);
             return;
           }
           
@@ -92,13 +96,13 @@ const SettingsScreen: React.FC = () => {
             console.log("date created: ", new Date(1721715837500).toLocaleString('en-US', options));
 
           } else {
-            console.error('No Google access token found in the payload');
+            console.log('No Google access token found in the payload');
           }
         } else {
-          console.error('No ID token found in the session');
+          console.log('No ID token found in the session');
         }
       } catch (error) {
-        console.error('Error getting Google access token:', error);
+        console.log('Error getting Google access token:', error);
       }
     };
 
@@ -176,19 +180,23 @@ const SettingsScreen: React.FC = () => {
   
       <View style={styles.divider} />
   
-      {/* Email Section */}
-      <View style={styles.section}>
-        <View style={styles.emailRow}>
-          <Text style={styles.sectionTitle}>Email: </Text>
-          <Text style={styles.userEmail}>{userEmail || 'Loading...'}</Text>
-        </View>
-        <TouchableOpacity style={styles.deleteAllButton} onPress={handleDeleteAllEmails}>
-          <Ionicons name="trash-outline" size={24} color="#fff" style={styles.buttonIcon} />
-          <Text style={styles.deleteAllButtonText}>Delete All Email</Text>
-        </TouchableOpacity>
-      </View>
-  
-      <View style={styles.divider} />
+      {/* Email Section - Only show when userSource is "Google" */}
+      {userSource === "Google" && (
+        <>
+          <View style={styles.section}>
+            <View style={styles.emailRow}>
+              <Text style={styles.sectionTitle}>Email: </Text>
+              <Text style={styles.userEmail}>{userEmail || 'Loading...'}</Text>
+            </View>
+            <TouchableOpacity style={styles.deleteAllButton} onPress={handleDeleteAllEmails}>
+              <Ionicons name="trash-outline" size={24} color="#fff" style={styles.buttonIcon} />
+              <Text style={styles.deleteAllButtonText}>Delete All Email</Text>
+            </TouchableOpacity>
+          </View>
+          <View style={styles.divider} />
+        </>
+      )}
+
   
       {/* History & Bookmarks Section */}
       <View style={styles.section}>