summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2020-07-30 14:51:57 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2020-07-30 14:51:57 +0530
commitcea9f4b9421b73b11aea4f619f1ae02e396e967a (patch)
tree8bd996cc491e2619c8075a5000e87e999fa35989
parent3afeff45d8bd5fff66e1d0fa2c15fa2527487af1 (diff)
parent1c7daff5baa71a659d5f5a94001df0f21feea4bc (diff)
Merge branch 'release' into develop
* release: build: bump version Prepare release 1.10.2 Fix two SMS Autofill crashes (#985) Fix TOTP import button check semantics (#982) Properly handle files without passwords (#969) Expand OTP and PasswordEntry tests (#968) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--CHANGELOG.md15
-rw-r--r--app/build.gradle.kts2
2 files changed, 12 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f49f0cb0..c6e8b397 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,11 +14,16 @@ All notable changes to this project will be documented in this file.
### Fixed
-- Properly handle cases where files contain only TOTP secrets and no password
- Allow creating nested directories directly
- I keep saying this but for real: error message for wrong SSH/HTTPS password is properly fixed now
-- Correctly hide TOTP import button when TOTP secret/OTPAUTH URL is already present in extra content
-- SMS OTP Autofill no longer crashes when invoked and correctly asks for the required permission on first use
+
+## [1.10.2] - 2020-07-30
+
+### Fixed
+
+- Properly handle cases where files contain only TOTP secrets and no password
+- Correctly hide TOTP import button when TOTP secret/OTPAUTH URL is already present in extra content
+- SMS OTP Autofill no longer crashes when invoked and correctly asks for the required permission on first use
## [1.10.1] - 2020-07-23
@@ -275,7 +280,9 @@ All notable changes to this project will be documented in this file.
- Fix elements overlapping.
-[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.1...HEAD
+[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.2...HEAD
+
+[1.10.2]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.1...1.10.2
[1.10.1]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.0...1.10.1
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1d66db57..a8e3a058 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,7 +28,7 @@ android {
defaultConfig {
applicationId = "dev.msfjarvis.aps"
- versionCode = 11011
+ versionCode = 11021
versionName = "1.11.0-SNAPSHOT"
}