rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Kunzisoft/KeePassDX into develop

Browse Source
This commit is contained in:
J-Jamet
2021-01-26 09:12:34 +01:00
parent 19e3aabca4 2d1ffc23b9
commit 9e931dd03f
18 changed files with 94 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -2,6 +2,7 @@ KeePassDX(2.9.12)
* Fix OTP token type #863
* Fix auto open biometric prompt #862
* Fix back appearance setting #865
* Fix orientation change in settings #872
* Change memory unit to MiB #851
* Small changes #642

5
app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt
View File

@@ -60,6 +60,9 @@ abstract class LockingActivity : SpecialModeActivity() {
private set
override fun onCreate(savedInstanceState: Bundle?) {
mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
super.onCreate(savedInstanceState)
if (savedInstanceState != null
@@ -84,8 +87,6 @@ abstract class LockingActivity : SpecialModeActivity() {
}
mExitLock = false
mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

3
app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt
View File

@@ -387,7 +387,8 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
if (styleEnabled) {
Stylish.assignStyle(styleIdString)
// Relaunch the current activity to redraw theme
activity.apply {
(activity as? SettingsActivity?)?.apply {
keepCurrentScreen()
startActivity(intent)
finish()
activity.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)

5
app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
View File

@@ -553,7 +553,10 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() {
true
}
R.id.menu_reload_database -> {
settingActivity?.mProgressDatabaseTaskProvider?.startDatabaseReload(false)
settingActivity?.apply {
keepCurrentScreen()
mProgressDatabaseTaskProvider?.startDatabaseReload(false)
}
return true
}

6
app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt
View File

@@ -35,9 +35,13 @@ abstract class NestedSettingsFragment : PreferenceFragmentCompat() {
APPLICATION, FORM_FILLING, ADVANCED_UNLOCK, APPEARANCE, DATABASE, DATABASE_SECURITY, DATABASE_MASTER_KEY
}
fun getScreen(): Screen {
return Screen.values()[requireArguments().getInt(TAG_KEY)]
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
onCreateScreenPreference(
Screen.values()[requireArguments().getInt(TAG_KEY)],
getScreen(),
savedInstanceState,
rootKey)
}

14
app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt
View File

@@ -117,6 +117,8 @@ open class SettingsActivity
intent.extras?.getString(FRAGMENT_ARG)?.let { fragmentScreenName ->
onNestedPreferenceSelected(NestedSettingsFragment.Screen.valueOf(fragmentScreenName), true)
}
// Eat state
intent.removeExtra(FRAGMENT_ARG)
}
}
@@ -224,11 +226,19 @@ open class SettingsActivity
}
toolbar?.title = NestedSettingsFragment.retrieveTitle(resources, key)
// To reload the current screen
intent.putExtra(FRAGMENT_ARG, key.name)
hideOrShowLockButton(key)
}
/**
* To keep the current screen when activity is reloaded
*/
fun keepCurrentScreen() {
(supportFragmentManager.findFragmentByTag(TAG_NESTED) as? NestedSettingsFragment?)
?.getScreen()?.let { fragmentKey ->
intent.putExtra(FRAGMENT_ARG, fragmentKey.name)
}
}
override fun onNestedPreferenceSelected(key: NestedSettingsFragment.Screen, reload: Boolean) {
if (mTimeoutEnable)
TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {

12
app/src/main/java/com/kunzisoft/keepass/utils/DataByte.kt
View File

@@ -29,9 +29,9 @@ class DataByte(var number: Long, var format: ByteFormat) {
return when (this.format) {
ByteFormat.BYTE -> {
when {
this.number % GIBIBYTES == 0L -> {
DataByte((this.number / GIBIBYTES), ByteFormat.GIBIBYTE)
}
//this.number % GIBIBYTES == 0L -> {
// DataByte((this.number / GIBIBYTES), ByteFormat.GIBIBYTE)
//}
this.number % MEBIBYTES == 0L -> {
DataByte((this.number / MEBIBYTES), ByteFormat.MEBIBYTE)
}
@@ -57,7 +57,7 @@ class DataByte(var number: Long, var format: ByteFormat) {
ByteFormat.BYTE -> this.number
ByteFormat.KIBIBYTE -> this.number * KIBIBYTES
ByteFormat.MEBIBYTE -> this.number * MEBIBYTES
ByteFormat.GIBIBYTE -> this.number * GIBIBYTES
//ByteFormat.GIBIBYTE -> this.number * GIBIBYTES
}
}
@@ -72,8 +72,8 @@ class DataByte(var number: Long, var format: ByteFormat) {
enum class ByteFormat(@StringRes var stringId: Int) {
BYTE(R.string.unit_byte),
KIBIBYTE(R.string.unit_kibibyte),
MEBIBYTE(R.string.unit_mebibyte),
GIBIBYTE(R.string.unit_gibibyte)
MEBIBYTE(R.string.unit_mebibyte)
//GIBIBYTE(R.string.unit_gibibyte)
}
companion object {

7
app/src/main/res/values-cs/strings.xml
View File

@@ -546,4 +546,11 @@
<string name="content">Obsah</string>
<string name="error_rebuild_list">Seznam nelze řádně sestavit.</string>
<string name="error_database_uri_null">URI databáze nelze načíst.</string>
<string name="autofill_inline_suggestions_keyboard">Návrhy samovyplnění přidány.</string>
<string name="autofill_inline_suggestions_title">Návrhy inline</string>
<string name="autofill_inline_suggestions_summary">Pokusí ze zobrazit návrhy samovyplnění přímo z kompatibilní klávesnice</string>
<string name="warning_database_revoked">Přístup k souboru odebrán správcem souborů, uzavřete databázi a nově ji otevřete z jejího adresáře.</string>
<string name="menu_reload_database">Databázi nově načíst</string>
<string name="warning_database_info_changed_options">Přepsat externí změny uložením databáze nebo databázi včetně posledních změn nově načíst.</string>
<string name="warning_database_info_changed">Informace obsažená ve Vašem databázovém souboru by změněna mimo aplikaci.</string>
</resources>

1
app/src/main/res/values-de/strings.xml
View File

@@ -557,4 +557,5 @@
<string name="kdf_Argon2d">Argon2d</string>
<string name="error_rebuild_list">Die Liste kann nicht ordnungsgemäß neu erstellt werden.</string>
<string name="error_database_uri_null">Datenbank-URI kann nicht abgerufen werden.</string>
<string name="menu_reload_database">Datenbank neu laden</string>
</resources>

7
app/src/main/res/values-hr/strings.xml
View File

@@ -529,4 +529,11 @@
<string name="kdf_Argon2d">Argon2d</string>
<string name="error_rebuild_list">Nije moguće ispravno obnoviti popis.</string>
<string name="error_database_uri_null">URI baze podataka nije moguće dobiti.</string>
<string name="autofill_inline_suggestions_title">Umetnuti prijedlozi</string>
<string name="autofill_inline_suggestions_keyboard">Prijedlozi za automatsko popunjavanje su dodani.</string>
<string name="autofill_inline_suggestions_summary">Pokušaj prikazivanja prijedloga za automatsko popunjavanje izravno s kompatibilne tipkovnice</string>
<string name="warning_database_revoked">Pristup datoteci koju je opozvao upravljač datoteka. Zatvori bazu podataka i ponovo je otvori s njezinog mjesta.</string>
<string name="warning_database_info_changed_options">Prepiši vanjske promjene spremanjem baze podataka ili je ponovo učitaj s najnovijim promjenama.</string>
<string name="warning_database_info_changed">Podaci u datoteci tvoje baze podataka izmijenjeni su izvan programa.</string>
<string name="menu_reload_database">Ponovo učitaj bazu podataka</string>
</resources>

10
app/src/main/res/values-ja/strings.xml
View File

@@ -543,5 +543,13 @@
<string name="content">コンテンツ</string>
<string name="kdf_Argon2id">Argon2id</string>
<string name="kdf_Argon2d">Argon2d</string>
<string name="error_database_uri_null">データベースのURIが見つかりません。</string>
<string name="error_database_uri_null">データベースの URI が取得できません。</string>
<string name="autofill_inline_suggestions_keyboard">自動入力候補が追加されました。</string>
<string name="autofill_inline_suggestions_summary">自動入力候補を互換性のあるキーボード上に直接表示することを試みます</string>
<string name="autofill_inline_suggestions_title">インライン自動入力</string>
<string name="warning_database_revoked">ファイルへのアクセス権がファイル マネージャーによって取り消されました。データベースを閉じて、ファイルの場所から再度開いてください。</string>
<string name="warning_database_info_changed_options">データベースを保存して外部の変更を上書きするか、再度読み込んで最新の変更を反映させてください。</string>
<string name="warning_database_info_changed">データベース ファイルに含まれる情報は、アプリの外部で変更されています。</string>
<string name="menu_reload_database">データベースを再度読み込む</string>
<string name="error_rebuild_list">リストを正しく再構築できません。</string>
</resources>

2
app/src/main/res/values-lt/strings.xml
View File

@@ -94,7 +94,7 @@
<string name="entry_keyfile">Rakto failas</string>
<string name="search">Įrašo pavadinimas/aprašymas</string>
<string name="menu_change_key_settings">Pakeisti master raktą</string>
<string name="entry_accessed">Naudota:</string>
<string name="entry_accessed">Naudota</string>
<string name="hide_password_title">Maskuoti slaptažodį</string>
<string name="space">Tarpas</string>
<string name="special">Specialus</string>

6
app/src/main/res/values-pl/strings.xml
View File

@@ -545,9 +545,9 @@
<string name="autofill_inline_suggestions_title">Sugestie wbudowane</string>
<string name="autofill_inline_suggestions_summary">Spróbuj wyświetlić sugestie autouzupełniania bezpośrednio z kompatybilnej klawiatury</string>
<string name="temp_advanced_unlock_enable_title">Zaawansowane odblokowywanie tymczasowe</string>
<string name="advanced_unlock_prompt_not_initialized">Nie można zainicjować zaawansowanego monitu o odblokowanie.</string>
<string name="open_advanced_unlock_prompt_store_credential">Otwórz zaawansowany monit o odblokowanie, aby zapisać poświadczenia</string>
<string name="open_advanced_unlock_prompt_unlock_database">Otwórz zaawansowany monit o odblokowanie, aby odblokować bazę danych</string>
<string name="advanced_unlock_prompt_not_initialized">Nie można zainicjować monitu odblokowania zaawansowanego.</string>
<string name="open_advanced_unlock_prompt_store_credential">Otwórz monit odblokowania zaawansowanego, aby odblokować bazę danych</string>
<string name="open_advanced_unlock_prompt_unlock_database">Otwórz monit odblokowania zaawansowanego, aby odblokować bazę danych</string>
<string name="warning_database_revoked">Dostęp do pliku odwołany przez menedżera plików, zamknij bazę danych i otwórz ją ponownie z jej lokalizacji.</string>
<string name="warning_database_info_changed_options">Nadpisz zewnętrzne modyfikacje, zapisując bazę danych lub przeładuj ją z najnowszymi zmianami.</string>
<string name="warning_database_info_changed">Informacje zawarte w pliku bazy danych zostały zmodyfikowane poza aplikacją.</string>

29
app/src/main/res/values-pt-rPT/strings.xml
View File

@@ -453,7 +453,7 @@
<string name="entry_otp">OTP</string>
<string name="compression_none">Nenhum</string>
<string name="enable_auto_save_database_summary">Gravar a base de dados automaticamente depois de uma ação importante (somente no modo \"Modificável\")</string>
<string name="error_copy_group_here">Mão pode copiar um grupo aqui.</string>
<string name="error_copy_group_here">Não pode copiar um grupo aqui.</string>
<string name="menu_delete_entry_history">Apagar histórico</string>
<string name="error_disallow_no_credentials">Ao menos uma credencial deve ser definida.</string>
<string name="settings_database_force_changing_master_key_title">Forçar renovação</string>
@@ -491,4 +491,31 @@
\n
\nA sua base de dados pode se tornar muito grande e reduzir o desempenho com este envio.</string>
<string name="content_description_credentials_information">Informações sobre credenciais</string>
<string name="device_credential">Credencial do dispositivo</string>
<string name="credential_before_click_advanced_unlock_button">Digite a palavra-chave, e depois clique no botão \"Desbloqueio avançado\".</string>
<string name="advanced_unlock_prompt_not_initialized">Incapaz de inicializar o desbloqueio antecipado.</string>
<string name="advanced_unlock_scanning_error">Erro de desbloqueio avançado: %1$s</string>
<string name="advanced_unlock_not_recognized">Não conseguia reconhecer impressão de desbloqueio avançado</string>
<string name="advanced_unlock_invalid_key">Não consegue ler a chave de desbloqueio avançada. Por favor, apague-a e repita o procedimento de desbloqueio de reconhecimento.</string>
<string name="advanced_unlock_prompt_extract_credential_message">Extrair credencial de base de dados com dados de desbloqueio avançados</string>
<string name="advanced_unlock_prompt_extract_credential_title">Base de dados aberta com reconhecimento avançado de desbloqueio</string>
<string name="advanced_unlock_prompt_store_credential_message">Advertência: Ainda precisa de se lembrar da sua palavra-passe principal se usar o reconhecimento avançado de desbloqueio.</string>
<string name="advanced_unlock_prompt_store_credential_title">Reconhecimento avançado de desbloqueio</string>
<string name="open_advanced_unlock_prompt_store_credential">Abrir o alerta de desbloqueio avançado para armazenar as credenciais</string>
<string name="open_advanced_unlock_prompt_unlock_database">Abrir o alerta de desbloqueio avançado para desbloquear a base de dados</string>
<string name="biometric_security_update_required">É necessária uma actualização de segurança biométrica.</string>
<string name="configure_biometric">O escaneamento biométrico é suportado, mas não configurado.</string>
<string name="warning_database_revoked">Acesso ao ficheiro revogado pelo gestor do ficheiro, fechar a base de dados e reabri-la a partir da sua localização.</string>
<string name="warning_database_info_changed_options">Sobregravar as modificações externas, guardando a base de dados ou recarregando-a com as últimas alterações.</string>
<string name="warning_database_info_changed">A informação contida no seu ficheiro de base de dados foi modificada fora da aplicação.</string>
<string name="warning_empty_recycle_bin">Apagar permanentemente todos os nós do caixote do lixo da reciclagem\?</string>
<string name="registration_mode">Modo de registo</string>
<string name="save_mode">Modo Guardar</string>
<string name="search_mode">Modo de pesquisa</string>
<string name="menu_keystore_remove_key">Apagar chave de desbloqueio avançada</string>
<string name="menu_reload_database">Recarregar base de dados</string>
<string name="error_rebuild_list">Incapaz de reconstruir adequadamente a lista.</string>
<string name="error_database_uri_null">O URI da base de dados não pode ser recuperado.</string>
<string name="error_field_name_already_exists">O nome do campo já existe.</string>
<string name="error_registration_read_only">Salvar um novo item não é permitido numa base de dados só de leitura</string>
</resources>

4
app/src/main/res/values-ru/strings.xml
View File

@@ -95,7 +95,7 @@
<string name="lowercase">Строчные</string>
<string name="hide_password_title">Скрывать пароли</string>
<string name="hide_password_summary">Скрывать пароли за (***) по умолчанию</string>
<string name="about">Сведения</string>
<string name="about">О программе</string>
<string name="menu_change_key_settings">Изменить главный пароль</string>
<string name="settings">Настройки</string>
<string name="menu_database_settings">Настройки базы</string>
@@ -295,7 +295,7 @@
<string name="html_text_dev_feature_work_hard">Мы прилагаем все усилия, чтобы быстро выпустить эту функцию.</string>
<string name="html_text_dev_feature_upgrade">Не забывайте обновлять приложение.</string>
<string name="download">Скачать</string>
<string name="contribute">Содействие</string>
<string name="contribute">Помочь проекту</string>
<string name="encryption_chacha20">ChaCha20</string>
<string name="kdf_AES">AES</string>
<string name="style_choose_title">Тема приложения</string>

2
app/src/main/res/values/donottranslate.xml
View File

@@ -181,7 +181,7 @@
<bool name="monospace_font_fields_enable_default" translatable="false">true</bool>
<string name="hide_expired_entries_key" translatable="false">hide_expired_entries_key</string>
<bool name="hide_expired_entries_default" translatable="false">false</bool>
<string name="show_uuid_key" translatable="false">hide_expired_entries_key</string>
<string name="show_uuid_key" translatable="false">show_uuid_key</string>
<bool name="show_uuid_default" translatable="false">false</bool>
<string name="enable_education_screens_key" translatable="false">enable_education_screens_key</string>
<bool name="enable_education_screens_default" translatable="false">true</bool>

1
fastlane/metadata/android/en-US/changelogs/56.txt
View File

@@ -1,5 +1,6 @@
* Fix OTP token type #863
* Fix auto open biometric prompt #862
* Fix back appearance setting #865
* Fix orientation change in settings #872
* Change memory unit to MiB #851
* Small changes #642

1
fastlane/metadata/android/fr-FR/changelogs/56.txt
View File

@@ -1,5 +1,6 @@
* Correction du type de token OTP #863
* Correction de l'ouverture automatique de l'invite biométrique #862
* Correction du retour dans les paramètres d'apparence #865
* Correction du changement d'orientation dans les paramètres #872
* Modification des unités de mémoire en MiB #851
* Petits changements #642