diff --git a/native/backup/backup-handler.js b/native/backup/backup-handler.js
index d8be748a6..567b07d6c 100644
--- a/native/backup/backup-handler.js
+++ b/native/backup/backup-handler.js
@@ -1,75 +1,85 @@
// @flow
import AsyncStorage from '@react-native-async-storage/async-storage';
import * as React from 'react';
import { useSelector } from 'react-redux';
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
+import { accountHasPassword } from 'lib/shared/account-utils.js';
import { getMessageForException } from 'lib/utils/errors.js';
import { BACKUP_HASH_STORAGE_KEY } from './constants.js';
import { convertObjToBytes } from './conversion-utils.js';
import { useClientBackup } from './use-client-backup.js';
import { commUtilsModule } from '../native-modules.js';
import Alert from '../utils/alert.js';
import { useStaffCanSee } from '../utils/staff-utils.js';
function BackupHandler(): null {
const userStore = useSelector(state => state.userStore);
const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const isBackupEnabled = useSelector(
state => state.localSettings.isBackupEnabled,
);
const loggedIn = useSelector(isLoggedIn);
const staffCanSee = useStaffCanSee();
+ const isAccountWithPassword = useSelector(state =>
+ accountHasPassword(state.currentUserInfo),
+ );
const { uploadBackupProtocol } = useClientBackup();
React.useEffect(() => {
(async () => {
- if (!isBackupEnabled || !loggedIn || !staffCanSee) {
+ if (
+ !isBackupEnabled ||
+ !loggedIn ||
+ !staffCanSee ||
+ !isAccountWithPassword
+ ) {
return;
}
const userData = { userStore };
const userDataBytes = convertObjToBytes(userData);
const currentBackupHash = commUtilsModule.sha256(userDataBytes.buffer);
const mostRecentlyUploadedBackupHash = await AsyncStorage.getItem(
BACKUP_HASH_STORAGE_KEY,
);
if (
!mostRecentlyUploadedBackupHash ||
currentBackupHash !== mostRecentlyUploadedBackupHash
) {
try {
await uploadBackupProtocol(userData);
await AsyncStorage.setItem(
BACKUP_HASH_STORAGE_KEY,
currentBackupHash,
);
} catch (e) {
console.error(`Backup uploading error: ${e}`);
Alert.alert(
'Backup protocol info',
`Backup uploading error: ${String(getMessageForException(e))}`,
);
}
}
})();
}, [
currentUserID,
isBackupEnabled,
staffCanSee,
loggedIn,
uploadBackupProtocol,
userStore,
+ isAccountWithPassword,
]);
return null;
}
export default BackupHandler;
diff --git a/native/profile/profile-screen.react.js b/native/profile/profile-screen.react.js
index 84ddb9750..a031efb65 100644
--- a/native/profile/profile-screen.react.js
+++ b/native/profile/profile-screen.react.js
@@ -1,435 +1,438 @@
// @flow
import * as React from 'react';
import { View, Text, Platform, ScrollView } from 'react-native';
import { logOutActionTypes, logOut } from 'lib/actions/user-actions.js';
import { useStringForUser } from 'lib/hooks/ens-cache.js';
import { preRequestUserStateSelector } from 'lib/selectors/account-selectors.js';
import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
import { accountHasPassword } from 'lib/shared/account-utils.js';
import type { LogOutResult } from 'lib/types/account-types.js';
import { type PreRequestUserState } from 'lib/types/session-types.js';
import { type CurrentUserInfo } from 'lib/types/user-types.js';
import {
type DispatchActionPromise,
useDispatchActionPromise,
useServerCall,
} from 'lib/utils/action-utils.js';
import type { ProfileNavigationProp } from './profile.react.js';
import { deleteNativeCredentialsFor } from '../account/native-credentials.js';
import EditUserAvatar from '../avatars/edit-user-avatar.react.js';
import Action from '../components/action-row.react.js';
import Button from '../components/button.react.js';
import EditSettingButton from '../components/edit-setting-button.react.js';
import { SingleLine } from '../components/single-line.react.js';
import type { NavigationRoute } from '../navigation/route-names.js';
import {
EditPasswordRouteName,
DeleteAccountRouteName,
BuildInfoRouteName,
DevToolsRouteName,
AppearancePreferencesRouteName,
FriendListRouteName,
BlockListRouteName,
PrivacyPreferencesRouteName,
DefaultNotificationsPreferencesRouteName,
LinkedDevicesRouteName,
BackupMenuRouteName,
} from '../navigation/route-names.js';
import { useSelector } from '../redux/redux-utils.js';
import { type Colors, useColors, useStyles } from '../themes/colors.js';
import Alert from '../utils/alert.js';
import { useStaffCanSee } from '../utils/staff-utils.js';
type ProfileRowProps = {
+content: string,
+onPress: () => void,
+danger?: boolean,
};
function ProfileRow(props: ProfileRowProps): React.Node {
const { content, onPress, danger } = props;
return (
);
}
type BaseProps = {
+navigation: ProfileNavigationProp<'ProfileScreen'>,
+route: NavigationRoute<'ProfileScreen'>,
};
type Props = {
...BaseProps,
+currentUserInfo: ?CurrentUserInfo,
+preRequestUserState: PreRequestUserState,
+logOutLoading: boolean,
+colors: Colors,
+styles: typeof unboundStyles,
+dispatchActionPromise: DispatchActionPromise,
+logOut: (preRequestUserState: PreRequestUserState) => Promise,
+staffCanSee: boolean,
+stringForUser: ?string,
+isAccountWithPassword: boolean,
};
class ProfileScreen extends React.PureComponent {
get loggedOutOrLoggingOut() {
return (
!this.props.currentUserInfo ||
this.props.currentUserInfo.anonymous ||
this.props.logOutLoading
);
}
render() {
- let developerTools, defaultNotifications, backupMenu;
- const { staffCanSee } = this.props;
+ let developerTools, defaultNotifications;
+ const { staffCanSee, isAccountWithPassword } = this.props;
if (staffCanSee) {
developerTools = (
);
defaultNotifications = (
);
+ }
+ let backupMenu;
+ if (staffCanSee && isAccountWithPassword) {
backupMenu = (
);
}
let passwordEditionUI;
if (accountHasPassword(this.props.currentUserInfo)) {
passwordEditionUI = (
Password
••••••••••••••••
);
}
let linkedDevices;
if (__DEV__) {
linkedDevices = (
);
}
return (
USER AVATAR
ACCOUNT
Logged in as
{this.props.stringForUser}
{passwordEditionUI}
PREFERENCES
{defaultNotifications}
{backupMenu}
{linkedDevices}
{developerTools}
);
}
onPressLogOut = () => {
if (this.loggedOutOrLoggingOut) {
return;
}
if (!this.props.isAccountWithPassword) {
Alert.alert(
'Log out',
'Are you sure you want to log out?',
[
{ text: 'No', style: 'cancel' },
{
text: 'Yes',
onPress: this.logOutWithoutDeletingNativeCredentialsWrapper,
style: 'destructive',
},
],
{ cancelable: true },
);
return;
}
const alertTitle =
Platform.OS === 'ios' ? 'Keep Login Info in Keychain' : 'Keep Login Info';
const alertDescription =
'We will automatically fill out log-in forms with your credentials ' +
'in the app.';
Alert.alert(
alertTitle,
alertDescription,
[
{ text: 'Cancel', style: 'cancel' },
{
text: 'Keep',
onPress: this.logOutWithoutDeletingNativeCredentialsWrapper,
},
{
text: 'Remove',
onPress: this.logOutAndDeleteNativeCredentialsWrapper,
style: 'destructive',
},
],
{ cancelable: true },
);
};
logOutWithoutDeletingNativeCredentialsWrapper = () => {
if (this.loggedOutOrLoggingOut) {
return;
}
this.logOut();
};
logOutAndDeleteNativeCredentialsWrapper = async () => {
if (this.loggedOutOrLoggingOut) {
return;
}
await this.deleteNativeCredentials();
this.logOut();
};
logOut() {
this.props.dispatchActionPromise(
logOutActionTypes,
this.props.logOut(this.props.preRequestUserState),
);
}
async deleteNativeCredentials() {
await deleteNativeCredentialsFor();
}
navigateIfActive(name) {
this.props.navigation.navigate({ name });
}
onPressEditPassword = () => {
this.navigateIfActive(EditPasswordRouteName);
};
onPressDeleteAccount = () => {
this.navigateIfActive(DeleteAccountRouteName);
};
onPressDevices = () => {
this.navigateIfActive(LinkedDevicesRouteName);
};
onPressBuildInfo = () => {
this.navigateIfActive(BuildInfoRouteName);
};
onPressDevTools = () => {
this.navigateIfActive(DevToolsRouteName);
};
onPressAppearance = () => {
this.navigateIfActive(AppearancePreferencesRouteName);
};
onPressPrivacy = () => {
this.navigateIfActive(PrivacyPreferencesRouteName);
};
onPressDefaultNotifications = () => {
this.navigateIfActive(DefaultNotificationsPreferencesRouteName);
};
onPressFriendList = () => {
this.navigateIfActive(FriendListRouteName);
};
onPressBlockList = () => {
this.navigateIfActive(BlockListRouteName);
};
onPressBackupMenu = () => {
this.navigateIfActive(BackupMenuRouteName);
};
}
const unboundStyles = {
avatarSection: {
alignItems: 'center',
paddingVertical: 16,
},
container: {
flex: 1,
},
content: {
flex: 1,
},
deleteAccountButton: {
paddingHorizontal: 24,
paddingVertical: 12,
},
editPasswordButton: {
paddingTop: Platform.OS === 'android' ? 3 : 2,
},
header: {
color: 'panelBackgroundLabel',
fontSize: 12,
fontWeight: '400',
paddingBottom: 3,
paddingHorizontal: 24,
},
label: {
color: 'panelForegroundTertiaryLabel',
fontSize: 16,
paddingRight: 12,
},
loggedInLabel: {
color: 'panelForegroundTertiaryLabel',
fontSize: 16,
},
logOutText: {
color: 'link',
fontSize: 16,
paddingLeft: 6,
},
row: {
flex: 1,
flexDirection: 'row',
justifyContent: 'space-between',
},
scrollView: {
backgroundColor: 'panelBackground',
},
scrollViewContentContainer: {
paddingTop: 24,
},
paddedRow: {
flex: 1,
flexDirection: 'row',
justifyContent: 'space-between',
paddingHorizontal: 24,
paddingVertical: 10,
},
section: {
backgroundColor: 'panelForeground',
borderBottomWidth: 1,
borderColor: 'panelForegroundBorder',
borderTopWidth: 1,
marginBottom: 24,
paddingVertical: 1,
},
unpaddedSection: {
backgroundColor: 'panelForeground',
borderBottomWidth: 1,
borderColor: 'panelForegroundBorder',
borderTopWidth: 1,
marginBottom: 24,
},
username: {
color: 'panelForegroundLabel',
flex: 1,
},
value: {
color: 'panelForegroundLabel',
fontSize: 16,
textAlign: 'right',
},
};
const logOutLoadingStatusSelector =
createLoadingStatusSelector(logOutActionTypes);
const ConnectedProfileScreen: React.ComponentType =
React.memo(function ConnectedProfileScreen(props: BaseProps) {
const currentUserInfo = useSelector(state => state.currentUserInfo);
const preRequestUserState = useSelector(preRequestUserStateSelector);
const logOutLoading =
useSelector(logOutLoadingStatusSelector) === 'loading';
const colors = useColors();
const styles = useStyles(unboundStyles);
const callLogOut = useServerCall(logOut);
const dispatchActionPromise = useDispatchActionPromise();
const staffCanSee = useStaffCanSee();
const stringForUser = useStringForUser(currentUserInfo);
const isAccountWithPassword = useSelector(state =>
accountHasPassword(state.currentUserInfo),
);
return (
);
});
export default ConnectedProfileScreen;