Require login after sent to background: add toggle in Security settings

ZeusLN · Dec 15, 2022 · 47c7e53 · 47c7e53
1 parent 8b684a9
commit 47c7e53
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 5 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -149,6 +149,7 @@
     "views.Settings.Security.deletePIN": "Delete PIN",
     "views.Settings.Security.deleteDuressPIN": "Delete Duress PIN",
     "views.Settings.Security.scramblePIN": "Scramble PIN numbers",
+    "views.Settings.Security.loginBackground": "Require login after app returns from background",
     "views.SparkQRScanner.text": "Scan a Spark QR code",
     "views.SparkQRScanner.error": "Error fetching Spark config",
     "views.ImportAccount.title": "Import account",

diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts
@@ -42,6 +42,7 @@ interface Settings {
     pin?: string;
     duressPin?: string;
     scramblePin?: boolean;
+    loginBackground?: boolean;
     authenticationAttempts?: number;
     fiat?: string;
     locale?: string;
@@ -164,6 +165,7 @@ export default class SettingsStore {
             enableMempoolRates: true
         },
         scramblePin: true,
+        loginBackground: false,
         fiat: DEFAULT_FIAT
     };
     @observable public loading = false;

diff --git a/views/Settings/Security.tsx b/views/Settings/Security.tsx
@@ -15,8 +15,10 @@ interface SecurityProps {
 
 interface SecurityState {
     scramblePin: boolean;
+    loginBackground: boolean;
     displaySecurityItems: Array<any>;
     pinExists: boolean;
+    passphraseExists: boolean;
 }
 
 const possibleSecurityItems = [
@@ -54,8 +56,10 @@ export default class Security extends React.Component<
 > {
     state = {
         scramblePin: true,
+        loginBackground: false,
         displaySecurityItems: [],
-        pinExists: false
+        pinExists: false,
+        passphraseExists: false
     };
 
     async componentDidMount() {
@@ -64,7 +68,8 @@ export default class Security extends React.Component<
         const settings = await getSettings();
 
         this.setState({
-            scramblePin: settings.scramblePin ?? true
+            scramblePin: settings.scramblePin ?? true,
+            loginBackground: settings.loginBackground ?? false
         });
 
         if (settings.pin) {
@@ -73,6 +78,12 @@ export default class Security extends React.Component<
             });
         }
 
+        if (settings.passphrase) {
+            this.setState({
+                passphraseExists: true
+            });
+        }
+
         // Three cases:
         // 1) If no passphrase or pin is set, allow user to set passphrase or pin
         // 2) If passphrase is set, allow user to set passphrase or duress passphrase
@@ -166,7 +177,13 @@ export default class Security extends React.Component<
 
     render() {
         const { navigation, SettingsStore } = this.props;
-        const { scramblePin, displaySecurityItems, pinExists } = this.state;
+        const {
+            scramblePin,
+            displaySecurityItems,
+            pinExists,
+            passphraseExists,
+            loginBackground
+        } = this.state;
         const { setSettings, getSettings } = SettingsStore;
 
         const BackButton = () => (
@@ -259,6 +276,61 @@ export default class Security extends React.Component<
                         />
                     </ListItem>
                 )}
+                {(pinExists || passphraseExists) && (
+                    <ListItem
+                        containerStyle={{
+                            backgroundColor: themeColor('background')
+                        }}
+                    >
+                        <ListItem.Content>
+                            <ListItem.Title
+                                style={{
+                                    color: themeColor('secondaryText'),
+                                    fontFamily: 'Lato-Regular'
+                                }}
+                            >
+                                {localeString(
+                                    'views.Settings.Security.loginBackground'
+                                )}
+                            </ListItem.Title>
+                        </ListItem.Content>
+                        <Switch
+                            value={scramblePin}
+                            onValueChange={async () => {
+                                this.setState({
+                                    loginBackground: !loginBackground
+                                });
+                                const settings = await getSettings();
+                                setSettings(
+                                    JSON.stringify({
+                                        nodes: settings.nodes,
+                                        theme: settings.theme,
+                                        selectedNode: settings.selectedNode,
+                                        fiat: settings.fiat,
+                                        passphrase: settings.passphrase,
+                                        duressPassphrase:
+                                            settings.duressPassphrase,
+                                        pin: settings.pin,
+                                        duressPin: settings.duressPin,
+                                        scramblePin: settings.scramblePin,
+                                        authenticationAttempts:
+                                            settings.authenticationAttempts,
+                                        locale: settings.locale,
+                                        privacy: settings.privacy,
+                                        loginBackground: !loginBackground
+                                    })
+                                );
+                            }}
+                            trackColor={{
+                                false: '#767577',
+                                true: themeColor('highlight')
+                            }}
+                            style={{
+                                alignSelf: 'flex-end'
+                            }}
+                        />
+                    </ListItem>
+                )}
             </ScrollView>
         );
     }

diff --git a/views/Wallet/Wallet.tsx b/views/Wallet/Wallet.tsx
@@ -111,10 +111,19 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
 
     handleAppStateChange = (nextAppState: any) => {
         const { SettingsStore } = this.props;
-        const { settings } = SettingsStore;
+        const { settings, implementation } = SettingsStore;
+        const { loginBackground } = settings;
         const loginRequired = settings && (settings.passphrase || settings.pin);
 
-        if (nextAppState.match(/inactive|background/) && loginRequired) {
+        if (
+            nextAppState.match(/inactive|background/) &&
+            loginRequired &&
+            loginBackground
+        ) {
+            if (implementation === 'lightning-node-connect') {
+                RESTUtils.disconnect();
+            }
+
             RNRestart.Restart();
         }
     };