diff --git a/components/app-wrapper.js b/components/app-wrapper.js index 6810d24..616ad0a 100644 --- a/components/app-wrapper.js +++ b/components/app-wrapper.js @@ -12,7 +12,7 @@ import AppStatusBar from './common/app-status-bar' import License from './License' import PasswordPrompt from './password-prompt' -import store from "../store" +import store from '../store' export default class AppWrapper extends Component { constructor() { @@ -51,7 +51,7 @@ export default class AppWrapper extends Component { enableShowLicenseAgreement = () => { this.setState({ shouldShowLicenseAgreement: true, - isCheckingLicenseAgreement: false + isCheckingLicenseAgreement: false, }) } @@ -62,7 +62,7 @@ export default class AppWrapper extends Component { enableShowApp = () => { this.setState({ shouldShowApp: true, - shouldShowPasswordPrompt: false + shouldShowPasswordPrompt: false, }) } @@ -79,11 +79,11 @@ export default class AppWrapper extends Component { if (isCheckingLicenseAgreement) { initialView = } else if (shouldShowLicenseAgreement) { - initialView = + initialView = } else if (shouldShowPasswordPrompt) { initialView = } else if (shouldShowApp) { - initialView = + initialView = this.checkDbPasswordSet()} /> } return ( @@ -100,5 +100,5 @@ export default class AppWrapper extends Component { const styles = StyleSheet.create({ container: { flex: 1, - } + }, }) diff --git a/components/app.js b/components/app.js index f8a0350..83afdf9 100644 --- a/components/app.js +++ b/components/app.js @@ -17,12 +17,12 @@ import setupNotifications from '../lib/notifications' import { getCycleDay, closeDb } from '../db' class App extends Component { - static propTypes = { date: PropTypes.string, navigation: PropTypes.object.isRequired, navigate: PropTypes.func, goBack: PropTypes.func, + restartApp: PropTypes.func, } constructor(props) { @@ -54,7 +54,7 @@ class App extends Component { } render() { - const { date, navigation, goBack } = this.props + const { date, navigation, goBack, restartApp } = this.props const { currentPage } = navigation if (!currentPage) { @@ -80,8 +80,8 @@ class App extends Component { return ( -
- +
+ ) @@ -90,25 +90,22 @@ class App extends Component { const styles = StyleSheet.create({ container: { - flex: 1 - } + flex: 1, + }, }) const mapStateToProps = (state) => { - return({ + return { date: getDate(state), - navigation: getNavigation(state) - }) + navigation: getNavigation(state), + } } const mapDispatchToProps = (dispatch) => { - return({ + return { navigate: (page) => dispatch(navigate(page)), goBack: () => dispatch(goBack()), - }) + } } -export default connect( - mapStateToProps, - mapDispatchToProps -)(App) +export default connect(mapStateToProps, mapDispatchToProps)(App) diff --git a/components/settings/password/create.js b/components/settings/password/create.js index 8838b30..f024c3f 100644 --- a/components/settings/password/create.js +++ b/components/settings/password/create.js @@ -1,4 +1,5 @@ import React, { Component } from 'react' +import PropTypes from 'prop-types' import Button from '../../common/button' @@ -8,6 +9,10 @@ import showBackUpReminder from './show-backup-reminder' import settings from '../../../i18n/en/settings' export default class CreatePassword extends Component { + static propTypes = { + changeEncryptionAndRestart: PropTypes.func, + } + constructor() { super() @@ -23,7 +28,7 @@ export default class CreatePassword extends Component { showBackUpReminder(this.toggleSettingPassword, () => {}) } - render () { + render() { const { isSettingPassword } = this.state const labels = settings.passwordSettings @@ -34,8 +39,11 @@ export default class CreatePassword extends Component { ) } else { - return + return ( + + ) } - } -} \ No newline at end of file +} diff --git a/components/settings/password/delete.js b/components/settings/password/delete.js index 8f078d7..d195c99 100644 --- a/components/settings/password/delete.js +++ b/components/settings/password/delete.js @@ -4,13 +4,13 @@ import PropTypes from 'prop-types' import Button from '../../common/button' import ConfirmWithPassword from '../common/confirm-with-password' -import { changeEncryptionAndRestartApp } from '../../../db' import labels from '../../../i18n/en/settings' export default class DeletePassword extends Component { static propTypes = { onStartDelete: PropTypes.func, - onCancelDelete: PropTypes.func + onCancelDelete: PropTypes.func, + changeEncryptionAndRestart: PropTypes.func, } constructor() { @@ -24,10 +24,6 @@ export default class DeletePassword extends Component { this.props.onStartDelete() } - startDeletePassword = async () => { - await changeEncryptionAndRestartApp() - } - cancelConfirmationWithPassword = () => { this.setState({ enteringCurrentPassword: false }) this.props.onCancelDelete() @@ -39,7 +35,7 @@ export default class DeletePassword extends Component { if (enteringCurrentPassword) { return ( ) @@ -51,4 +47,4 @@ export default class DeletePassword extends Component { ) } -} \ No newline at end of file +} diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js index 15f5d08..a593e13 100644 --- a/components/settings/password/enter-new-password.js +++ b/components/settings/password/enter-new-password.js @@ -1,20 +1,23 @@ import React, { Component } from 'react' import { StyleSheet } from 'react-native' import nodejs from 'nodejs-mobile-react-native' +import PropTypes from 'prop-types' import AppText from '../../common/app-text' import AppTextInput from '../../common/app-text-input' import Button from '../../common/button' -import { requestHash, changeEncryptionAndRestartApp } from '../../../db' +import { requestHash } from '../../../db' import { Colors, Spacing } from '../../../styles' import settings from '../../../i18n/en/settings' const LISTENER_TYPE = 'create-or-change-pw' export default class EnterNewPassword extends Component { - - constructor() { + static propTypes = { + changeEncryptionAndRestart: PropTypes.func, + } + constructor(props) { super() this.state = { password: '', @@ -23,13 +26,16 @@ export default class EnterNewPassword extends Component { } nodejs.channel.addListener( LISTENER_TYPE, - changeEncryptionAndRestartApp, + props.changeEncryptionAndRestart, this ) } componentWillUnmount() { - nodejs.channel.removeListener(LISTENER_TYPE, changeEncryptionAndRestartApp) + nodejs.channel.removeListener( + LISTENER_TYPE, + this.props.changeEncryptionAndRestart + ) } savePassword = () => { @@ -52,15 +58,12 @@ export default class EnterNewPassword extends Component { this.setState({ passwordConfirmation }) } - render () { - const { - password, - passwordConfirmation, - shouldShowErrorMessage - } = this.state + render() { + const { password, passwordConfirmation, shouldShowErrorMessage } = + this.state const labels = settings.passwordSettings const isButtonActive = - (password.length > 0) && (passwordConfirmation.length > 0) + password.length > 0 && passwordConfirmation.length > 0 return ( @@ -80,10 +83,14 @@ export default class EnterNewPassword extends Component { value={passwordConfirmation} secureTextEntry={true} /> - {shouldShowErrorMessage && + {shouldShowErrorMessage && ( {labels.passwordsDontMatch} - } - @@ -94,6 +101,6 @@ export default class EnterNewPassword extends Component { const styles = StyleSheet.create({ error: { color: Colors.orange, - marginTop: Spacing.base - } -}) \ No newline at end of file + marginTop: Spacing.base, + }, +}) diff --git a/components/settings/password/index.js b/components/settings/password/index.js index 5e67e5d..90a081c 100644 --- a/components/settings/password/index.js +++ b/components/settings/password/index.js @@ -1,4 +1,10 @@ import React, { Component } from 'react' +import { connect } from 'react-redux' +import PropTypes from 'prop-types' + +import { navigate } from '../../../slices/navigation' + +import { changeDbEncryption } from '../../../db' import AppPage from '../../common/app-page' import AppText from '../../common/app-text' @@ -11,14 +17,18 @@ import DeletePassword from './delete' import { hasEncryptionObservable } from '../../../local-storage' import labels from '../../../i18n/en/settings' -export default class PasswordSetting extends Component { +class PasswordSetting extends Component { + static propTypes = { + navigate: PropTypes.func, + restartApp: PropTypes.func, + } constructor(props) { super(props) this.state = { isPasswordSet: hasEncryptionObservable.value, isChangingPassword: false, - isDeletingPassword: false + isDeletingPassword: false, } } @@ -38,19 +48,17 @@ export default class PasswordSetting extends Component { this.setState({ isDeletingPassword: false }) } + changeEncryptionAndRestart = async (hash) => { + await changeDbEncryption(hash) + await this.props.restartApp() + this.props.navigate('Home') + } + render() { + const { isPasswordSet, isChangingPassword, isDeletingPassword } = this.state - const { - isPasswordSet, - isChangingPassword, - isDeletingPassword, - } = this.state - - const { - title, - explainerEnabled, - explainerDisabled - } = labels.passwordSettings + const { title, explainerEnabled, explainerDisabled } = + labels.passwordSettings return ( @@ -59,19 +67,25 @@ export default class PasswordSetting extends Component { {isPasswordSet ? explainerEnabled : explainerDisabled} - {!isPasswordSet && } - - {(isPasswordSet && !isDeletingPassword) && ( - )} - {(isPasswordSet && !isChangingPassword) && ( + {isPasswordSet && !isDeletingPassword && ( + + )} + + {isPasswordSet && !isChangingPassword && ( )} @@ -79,3 +93,11 @@ export default class PasswordSetting extends Component { ) } } + +const mapDispatchToProps = (dispatch) => { + return { + navigate: (page) => dispatch(navigate(page)), + } +} + +export default connect(null, mapDispatchToProps)(PasswordSetting) diff --git a/components/settings/password/update.js b/components/settings/password/update.js index a711262..a83d701 100644 --- a/components/settings/password/update.js +++ b/components/settings/password/update.js @@ -12,7 +12,8 @@ import settings from '../../../i18n/en/settings' export default class ChangePassword extends Component { static propTypes = { onStartChange: PropTypes.func, - onCancelChange: PropTypes.func + onCancelChange: PropTypes.func, + changeEncryptionAndRestart: PropTypes.func, } constructor() { @@ -21,7 +22,7 @@ export default class ChangePassword extends Component { this.state = { currentPassword: null, enteringCurrentPassword: false, - enteringNewPassword: false + enteringNewPassword: false, } } @@ -41,7 +42,7 @@ export default class ChangePassword extends Component { this.setState({ currentPassword: null, enteringNewPassword: true, - enteringCurrentPassword: false + enteringCurrentPassword: false, }) } @@ -49,17 +50,14 @@ export default class ChangePassword extends Component { this.setState({ currentPassword: null, enteringNewPassword: false, - enteringCurrentPassword: false + enteringCurrentPassword: false, }) this.props.onCancelChange() } render() { - const { - enteringCurrentPassword, - enteringNewPassword, - currentPassword - } = this.state + const { enteringCurrentPassword, enteringNewPassword, currentPassword } = + this.state const labels = settings.passwordSettings const isPasswordSet = currentPassword !== null @@ -73,7 +71,11 @@ export default class ChangePassword extends Component { } if (enteringNewPassword) { - return + return ( + + ) } return ( @@ -86,4 +88,4 @@ export default class ChangePassword extends Component { ) } -} \ No newline at end of file +} diff --git a/db/index.js b/db/index.js index 71c5e1d..2a0a3a1 100644 --- a/db/index.js +++ b/db/index.js @@ -2,7 +2,6 @@ import Realm from 'realm' import { LocalDate, ChronoUnit } from '@js-joda/core' import nodejs from 'nodejs-mobile-react-native' import fs from 'react-native-fs' -import { restartApp } from './restart-app' import schemas from './schemas' import cycleModule from '../lib/cycle' @@ -195,7 +194,7 @@ export function requestHash(type, pw) { ) } -export async function changeEncryptionAndRestartApp(hash) { +export async function changeDbEncryption(hash) { let key if (hash) key = hashToInt8Array(hash) const defaultPath = db.path @@ -205,16 +204,10 @@ export async function changeEncryptionAndRestartApp(hash) { const copyPath = dir.join('/') const exists = await fs.exists(copyPath) if (exists) await fs.unlink(copyPath) - // for some reason, realm complains if we give it a key with value undefined - if (key) { - db.writeCopyTo(copyPath, key) - } else { - db.writeCopyTo(copyPath) - } + db.writeCopyTo({ path: copyPath, encryptionKey: key }) db.close() await fs.unlink(defaultPath) await fs.moveFile(copyPath, defaultPath) - restartApp() } export function isDbEmpty() { diff --git a/db/restart-app/index.android.js b/db/restart-app/index.android.js deleted file mode 100644 index 3a84dc2..0000000 --- a/db/restart-app/index.android.js +++ /dev/null @@ -1,5 +0,0 @@ -// Current version of react-native-restart doesn't work with our ios setup -// therefore we have a fork and use different libraries on the platforms -import restart from 'react-native-restart' - -export const restartApp = restart.Restart diff --git a/db/restart-app/index.ios.js b/db/restart-app/index.ios.js deleted file mode 100644 index 0f3db9b..0000000 --- a/db/restart-app/index.ios.js +++ /dev/null @@ -1,11 +0,0 @@ -// Current version of react-native-restart doesn't work with our ios setup -// therefore we have a fork and use different libraries on the platforms -import RNExitApp from 'react-native-exit-app-v2' -import { Alert } from 'react-native' - -export const restartApp = () => { - Alert.alert('Closing app', 'App is shutting down. Please restart.') - setTimeout(() => { - RNExitApp.exitApp() - }, 3000) -} diff --git a/i18n/en.json b/i18n/en.json index 93240c7..90fab96 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -17,7 +17,7 @@ "settings": { "license": { "title": "drip. an open-source cycle tracking app", - "text": "Copyright (C) {{currentYear}} Heart of Code e.V.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: https://www.gnu.org/licenses/gpl-3.0.html\n\nYou can contact us at drip@mailbox.org." + "text": "Copyright (C) {{currentYear}} Heart of Code e.V.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: https://www.gnu.org/licenses/gpl-3.0.html." }, "privacyPolicy": { "title": "Privacy Policy", diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj index 9ad4ebe..84633b1 100644 --- a/ios/drip.xcodeproj/project.pbxproj +++ b/ios/drip.xcodeproj/project.pbxproj @@ -897,7 +897,7 @@ "\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"", "$(inherited)", ); - MARKETING_VERSION = 1.2208.2; + MARKETING_VERSION = 1.2208.11; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -980,7 +980,7 @@ "\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"", "$(inherited)", ); - MARKETING_VERSION = 1.2208.2; + MARKETING_VERSION = 1.2208.11; OTHER_LDFLAGS = ( "-ObjC", "-lc++", diff --git a/ios/drip/Info.plist b/ios/drip/Info.plist index 12c07c1..d912bdd 100644 --- a/ios/drip/Info.plist +++ b/ios/drip/Info.plist @@ -22,6 +22,8 @@ ???? CFBundleVersion 1 + ITSAppUsesNonExemptEncryption + LSRequiresIPhoneOS NSAppTransportSecurity @@ -81,9 +83,9 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown + UIUserInterfaceStyle + Light UIViewControllerBasedStatusBarAppearance - UIUserInterfaceStyle - Light diff --git a/package-lock.json b/package-lock.json index d8a26bb..8d36114 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "drip.", - "version": "1.2208.2", + "version": "1.2208.11", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -15384,11 +15384,6 @@ "resolved": "https://registry.npmjs.org/react-native-document-picker/-/react-native-document-picker-4.3.0.tgz", "integrity": "sha512-ygcY0ijlVuhxzdWnhqd917yMUFT9FF0b4CM81LWoY4/bpQYz5PGUdRAdh25kS0VA+cEUYNL2iI7OpHXq00epPA==" }, - "react-native-exit-app-v2": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/react-native-exit-app-v2/-/react-native-exit-app-v2-1.2.2.tgz", - "integrity": "sha512-RWCfmus7h99M1aONqBnWG3g3TFRzKsmok6cLAuqN5NVQAxpcgzbJZgAryA/ADpmBrBP5EIJnCBFo64ApQGOZPw==" - }, "react-native-fs": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz", @@ -15423,11 +15418,6 @@ "@react-native-community/push-notification-ios": "^1.0.1" } }, - "react-native-restart": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/react-native-restart/-/react-native-restart-0.0.24.tgz", - "integrity": "sha512-pvJNU3NwQk6bCG2gOWcQpZ4IxhtELB0K9gzmtixfsaTFbW1UXXHkJNjk1kHazcbH5hrD7QbUkR63fsAVh8X4VQ==" - }, "react-native-share": { "version": "3.8.5", "resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-3.8.5.tgz", diff --git a/package.json b/package.json index caa7fea..5dee2b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "drip.", - "version": "1.2208.2", + "version": "1.2208.11", "contributors": [ "Julia Friesel ", "Marie Kochsiek", @@ -46,12 +46,10 @@ "react-native": "0.62.0", "react-native-calendars": "^1.1287.0", "react-native-document-picker": "^4.2.0", - "react-native-exit-app-v2": "^1.2.2", "react-native-fs": "^2.20.0", "react-native-hyperlink": "0.0.19", "react-native-modal-datetime-picker": "8.0.0", "react-native-push-notification": "3.2.1", - "react-native-restart": "0.0.24", "react-native-share": "^3.0.0", "react-native-simple-toast": "^1.1.3", "react-native-size-matters": "^0.4.0",