From b6584414f76321e5ed3172fb35c87563761b8413 Mon Sep 17 00:00:00 2001 From: Guillaume Vincent Date: Mon, 27 Feb 2023 21:11:43 +0100 Subject: [PATCH] Add LessPass Database Url text field on the login screen --- mobile/android/app/build.gradle | 4 +-- mobile/ios/LessPass.xcodeproj/project.pbxproj | 4 +-- mobile/package.json | 2 +- mobile/src/auth/SignInScreen.js | 43 ++++++++++---------------- mobile/src/auth/SignUpScreen.js | 10 ++++-- mobile/src/messages/messagesReducer.js | 1 - mobile/src/password/PasswordGeneratorScreen.js | 43 -------------------------- mobile/src/version.json | 2 +- 8 files changed, 30 insertions(+), 79 deletions(-) diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 9a5795f..6d71203 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -147,8 +147,8 @@ android { applicationId "com.lesspass.android" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 9007006 - versionName "9.7.6" + versionCode 9007007 + versionName "9.7.7" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/mobile/ios/LessPass.xcodeproj/project.pbxproj b/mobile/ios/LessPass.xcodeproj/project.pbxproj index 8b637b8..50af35a 100644 --- a/mobile/ios/LessPass.xcodeproj/project.pbxproj +++ b/mobile/ios/LessPass.xcodeproj/project.pbxproj @@ -529,7 +529,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 9.7.6; + MARKETING_VERSION = 9.7.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -557,7 +557,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 9.7.6; + MARKETING_VERSION = 9.7.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/mobile/package.json b/mobile/package.json index 830f741..2121579 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -1,6 +1,6 @@ { "name": "lesspass-mobile", - "version": "9.7.6", + "version": "9.7.7", "description": "LessPass mobile application", "license": "(MPL-2.0 OR GPL-3.0)", "author": "Guillaume Vincent ", diff --git a/mobile/src/auth/SignInScreen.js b/mobile/src/auth/SignInScreen.js index 6014496..54a5168 100644 --- a/mobile/src/auth/SignInScreen.js +++ b/mobile/src/auth/SignInScreen.js @@ -7,10 +7,8 @@ import { Platform, TouchableWithoutFeedback, Keyboard, - View, - Linking, } from "react-native"; -import { Text, Button, Title, useTheme } from "react-native-paper"; +import { Button, Title } from "react-native-paper"; import MasterPassword from "../password/MasterPassword"; import TextInput from "../ui/TextInput"; import Styles from "../ui/Styles"; @@ -18,7 +16,7 @@ import { addError } from "../errors/errorsActions"; import { signIn } from "./authActions"; import routes from "../routes"; import { useNavigation } from "@react-navigation/native"; -import { readMessage } from "../messages/messagesActions"; +import { setSettings } from "../settings/settingsActions"; export default function SignInScreen() { const [email, setEmail] = useState(""); @@ -26,10 +24,10 @@ export default function SignInScreen() { const [isLoading, setIsLoading] = useState(false); const navigation = useNavigation(); const dispatch = useDispatch(); - const theme = useTheme(); const encryptMasterPassword = useSelector( (state) => state.settings.encryptMasterPassword ); + const baseURL = useSelector((state) => state.settings.baseURL); return ( - Connect to Lesspass Database + Connect to your Lesspass Database + dispatch(setSettings(text))} + /> { - dispatch(readMessage("LessPassServerWillBeTurnedOffOnMarch")); setIsLoading(true); dispatch( signIn( @@ -85,26 +88,12 @@ export default function SignInScreen() { > Sign In - - - LessPass Database server will be turned off on March 1th, 2023. - You can export your passwords using the web extension, the CLI or - the web site. - - - + diff --git a/mobile/src/auth/SignUpScreen.js b/mobile/src/auth/SignUpScreen.js index 0318c13..019cb52 100644 --- a/mobile/src/auth/SignUpScreen.js +++ b/mobile/src/auth/SignUpScreen.js @@ -6,7 +6,7 @@ import { TouchableWithoutFeedback, Keyboard, } from "react-native"; -import { Button, Title, useTheme } from "react-native-paper"; +import { Button, Title } from "react-native-paper"; import MasterPassword from "../password/MasterPassword"; import TextInput from "../ui/TextInput"; import Styles from "../ui/Styles"; @@ -23,10 +23,10 @@ export default function SignUpScreen() { const [isLoading, setIsLoading] = useState(false); const navigation = useNavigation(); const dispatch = useDispatch(); - const theme = useTheme(); const encryptMasterPassword = useSelector( (state) => state.settings.encryptMasterPassword ); + const baseURL = useSelector((state) => state.settings.baseURL); return ( Create an account dispatch(setSettings(text))} + /> + state.profile); const settings = useSelector((state) => state.settings); const auth = useSelector((state) => state.auth); - const messages = useSelector((state) => state.messages); const dispatch = useDispatch(); const [copied, setCopied] = useState(false); const [seePassword, setSeePassword] = useState(false); @@ -310,46 +307,6 @@ export default function PasswordGeneratorScreen() { )} - {auth.isAuthenticated && - !messages["LessPassServerWillBeTurnedOffOnMarch"] && ( - <> - - LessPass Database server will be turned off on March 1th, - 2023. You can export your passwords using the web extension, - the CLI or the web site. - { - Linking.openURL( - "https://blog.lesspass.com/2022-12-29/decommissioning-lesspass-database" - ); - }} - > - {" "} - See announcement - - - - - )}