88f44a9f66
* 'master' of https://github.com/seedvault-app/seedvault: (50 commits) Bump version to 11-2.2 Changelog: Update till 11-2.1 Restrict exported components Allow launching restore through a dialer code Add expert settings with an option for unlimited quota Prevent screenshots of recovery code Use clearer more generic strings Ask for system authentication before storing a new recovery code Split up validating, verifying and storing of recovery code Disable Nextcloud restore when not installed and no store available Disable spell-checker on recovery code input Add warning for third-party tools to README document potential information leakage through the long-lived SQL caches Provide an overview over key derivations Compares kotlin-bip39 library with bitcoinj library Link FAQ in Readme to make it more discoverable Move LocalContactsBackup to product partition Add newline at the end of all files Improve .editorconfig setup Don't backup on metered networks ... Conflicts: app/src/main/res/values-de/strings.xml app/src/main/res/values-es/strings.xml app/src/main/res/values-pt/strings.xml app/src/main/res/values-zh-rCN/strings.xml Conflicts resolved by simply checking out translations from android11, since they are not modified in master at all. Change-Id: I0a83c72dbc78b38985b46f9b75ce92e27acd2e03 |
||
|---|---|---|
| .. | ||
| androidTest | ||
| debug/res/values | ||
| main | ||
| sharedTest/java/com/stevesoltys/seedvault | ||
| test/java/com/stevesoltys/seedvault | ||