From 8f70eb7577ef6a81b55120bdafb5f99b5c33a35b Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Sun, 31 May 2020 19:00:24 -0400 Subject: [PATCH 1/8] #149 - Modify the KeyStore intro description/warning Add commas where (seemingly) appropriate, for better flow Specify andOTP (or the appropriate subject) in some cases instead of "the" or "it" Use the term "hardware-based encryption" instead of "hardware cryptography" --- app/src/main/res/values/strings_intro.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml index 6ff72ba0..e107fd21 100644 --- a/app/src/main/res/values/strings_intro.xml +++ b/app/src/main/res/values/strings_intro.xml @@ -8,15 +8,16 @@ To ensure the security of your accounts andOTP only stores them in encrypted data files. Here you can choose which method of encryption will be used. - The KeyStore is a system component of Android for - securely storing cryptographic keys. The advantage of this method is that the keys are - stored separated from the data files and can be backed by hardware cryptography (if your - device supports it). However, as the keys are not stored with the apps data, this method - prevents external backup solutions (like Titanium) from working. If you choose this - method you will have to rely on the internal backup functions provided by andOTP. - \n\nWarning: The KeyStore is known to cause a lot of problems, please only use it if - you absolutely have to. If you don\'t mind entering a password / PIN every time you start - andOTP it is highly recommended to use the password-based encryption instead. + The KeyStore is a system component of Android used to + securely store cryptographic keys. The advantage of using the KeyStore is that the keys are + stored separately from andOTP\'s data, and can be backed by hardware-based encryption + (if your device supports it). However, as the keys are not stored with andOTP\'s data, + this method prevents external backup solutions (like Titanium) from working. If you + choose this method, you will have to rely on the internal backup functions provided by + andOTP.\n\nWarning: The KeyStore is known to cause many problems, so + please only use it if you absolutely have to. If you don\'t mind entering a password / PIN + every time you start andOTP, it is highly recommended to use the password-based + encryption instead. This method will encrypt your data with a key generated from a password or PIN. The main advantage here is that this will work with external backup solutions (like Titanium) and is much less failure-prone than the KeyStore. From a32a767d7497c18ab25df53ff6732104886ca0b5 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Sun, 31 May 2020 19:14:32 -0400 Subject: [PATCH 2/8] #149 - Modify the encryption-type intro description Use a comma in first sentence for better flow Change "only stores them in encrypted data files" to "andOTP uses encryption to store account data" --- app/src/main/res/values/strings_intro.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml index e107fd21..0eb164b9 100644 --- a/app/src/main/res/values/strings_intro.xml +++ b/app/src/main/res/values/strings_intro.xml @@ -5,8 +5,8 @@ the initial setup. Please pay attention and read carefully otherwise you could lose data! \n\nDon\'t worry, you can still change any of the options later in the Settings. - To ensure the security of your accounts andOTP only - stores them in encrypted data files. Here you can choose which method of encryption will be + To ensure the security of your accounts, andOTP uses + encryption to store account data. Here you can choose which method of encryption will be used. The KeyStore is a system component of Android used to securely store cryptographic keys. The advantage of using the KeyStore is that the keys are From 8a3b96a8319931cd335d2367b24382a8e78a2576 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Sun, 31 May 2020 19:33:47 -0400 Subject: [PATCH 3/8] #149 - Modify the initial intro description Separate the initial sentence into two separate sentences for better flow Use "Please pay attention and read carefully to avoid losing data"; this is subjective, but it seems to flow better than the original sentence --- app/src/main/res/values/strings_intro.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml index 0eb164b9..63a54f87 100644 --- a/app/src/main/res/values/strings_intro.xml +++ b/app/src/main/res/values/strings_intro.xml @@ -1,9 +1,9 @@ Let\'s get started - Welcome to andOTP, this wizard will guide you through - the initial setup. Please pay attention and read carefully otherwise you could lose data! - \n\nDon\'t worry, you can still change any of the options later in the Settings. + Welcome to andOTP! This wizard will guide you through + the initial setup process. Please pay attention and read carefully in order to avoid losing data. + \n\nDon\'t worry, you can still change any of these options later on in the Settings. To ensure the security of your accounts, andOTP uses encryption to store account data. Here you can choose which method of encryption will be From e488b92baf05870d4d9d99a70e3af78bc519bc27 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Sun, 31 May 2020 19:54:33 -0400 Subject: [PATCH 4/8] #149 - Modify password/PIN intro description Mostly rewording the "advantage" sentence to flow better --- app/src/main/res/values/strings_intro.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml index 63a54f87..963e6bd1 100644 --- a/app/src/main/res/values/strings_intro.xml +++ b/app/src/main/res/values/strings_intro.xml @@ -19,9 +19,10 @@ every time you start andOTP, it is highly recommended to use the password-based encryption instead. This method will encrypt your data with a key - generated from a password or PIN. The main advantage here is that this will work with - external backup solutions (like Titanium) and is much less failure-prone than the KeyStore. - However, you will have to enter your credentials every time you start andOTP. + generated from a password or PIN. The main advantage of using this method is that external + backup solutions (like Titanium) will work as expected, and it is much less failure-prone + than the KeyStore. However, you will have to enter your credentials every time you start + andOTP. Here you can setup an authentication to lock andOTP. Since you have chosen Android KeyStore as encryption method this is From 9e921383ed0ad565179ff5125e6c011192fe1f0d Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Sun, 31 May 2020 20:09:12 -0400 Subject: [PATCH 5/8] #149 - Modify authentication method setting intro step strings Use "setup and authentication method" instead of "setup an authentication" Add "your" before "encryption method" to sound more natural, and add a comma for better flow --- app/src/main/res/values/strings_intro.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml index 963e6bd1..9a28e914 100644 --- a/app/src/main/res/values/strings_intro.xml +++ b/app/src/main/res/values/strings_intro.xml @@ -24,12 +24,12 @@ than the KeyStore. However, you will have to enter your credentials every time you start andOTP. - Here you can setup an authentication to lock - andOTP. Since you have chosen Android KeyStore as encryption method this is - optional. - Here you can setup an authentication to lock - andOTP. Since you have chosen Password / PIN as encryption method you need to - set either a password or a PIN to proceed. + Here you can setup an authentication method to lock + andOTP. Since you have chosen Android KeyStore as your encryption method, this + step is optional. + Here you can setup an authentication method to lock + andOTP. Since you have chosen Password / PIN as your encryption method, a + password or a PIN must be set to proceed. Please set a password to continue! Please set a PIN to continue! Please confirm your password to continue! From 08b2e5c3a40e36b6a2829bf0122cbe99b12a1248 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Mon, 1 Jun 2020 20:11:48 -0400 Subject: [PATCH 6/8] #149 - Modify KeyStore error message Use "be lost" instead of "get lost" in first sentence Modify second sentence to sound more natural --- app/src/main/res/values/strings_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings_main.xml b/app/src/main/res/values/strings_main.xml index b54cc097..1933a185 100644 --- a/app/src/main/res/values/strings_main.xml +++ b/app/src/main/res/values/strings_main.xml @@ -100,7 +100,7 @@ \"Last used\".\n\nThis message will not be shown again. Failed to load the encryption key from the KeyStore. - Any entries that are added will get lost.\n\nTo still be able to use andOTP you can go + Any entries that are added will be lost.\n\nTo continue using andOTP, you can go to the Settings and switch the Database encryption to Password / PIN. This will be the last version of andOTP to From 74c35ae7bc73e9633c2504077257960985a74f6d Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Mon, 1 Jun 2020 20:32:35 -0400 Subject: [PATCH 7/8] #149 - Reword settings saved confirmation message The original sentence was fine as is, but moving the "now" seems to sound more natural --- app/src/main/res/values/strings_intro.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings_intro.xml b/app/src/main/res/values/strings_intro.xml index 9a28e914..5856d1bc 100644 --- a/app/src/main/res/values/strings_intro.xml +++ b/app/src/main/res/values/strings_intro.xml @@ -36,6 +36,6 @@ Please confirm your PIN to continue! Finished - Your settings have been saved, you are all set to use - andOTP now! + Your settings have been saved, you are now all set to use + andOTP! \ No newline at end of file From 86559fc8beb66bd4d4cc4714daaae68572d1ecc5 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Mon, 1 Jun 2020 20:34:42 -0400 Subject: [PATCH 8/8] #149 - Reword authentication confirmation message --- app/src/main/res/values/strings_auth.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings_auth.xml b/app/src/main/res/values/strings_auth.xml index ac4cbf9a..5a0a39c9 100644 --- a/app/src/main/res/values/strings_auth.xml +++ b/app/src/main/res/values/strings_auth.xml @@ -8,8 +8,8 @@ Please authenticate to start andOTP! - Please confirm your authentication to generate the - new encryption key! + Please confirm authentication to generate your + encryption key! Unlock