Skip to content

Commit 1584f4f

Browse files
michaelschattgenmichaelschattgen
authored
Merge branch 'beemdevelopment:master' into feature/multiselect-groups
2 parents fd0dcaf + 81a26cc commit 1584f4f

File tree

9 files changed

+154
-36
lines changed

9 files changed

+154
-36
lines changed

‎.github/workflows/codeql-analysis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
actions: read
1515
contents: read
1616
security-events: write
17+
if: github.event_name != 'schedule' || github.repository == 'beemdevelopment/Aegis'
1718
steps:
1819
- name: Checkout
1920
uses: actions/checkout@v4

‎app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ android {
2828
applicationId "${packageName}"
2929
minSdkVersion 21
3030
targetSdkVersion 35
31-
versionCode 75
32-
versionName "3.3.2"
31+
versionCode 76
32+
versionName "3.3.3"
3333
multiDexEnabled true
3434
buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
3535
buildConfigField "String", "GIT_BRANCH", "\"${getGitBranch()}\""

‎app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
android:icon="@mipmap/${iconName}"
2828
android:label="Aegis"
2929
android:supportsRtl="true"
30+
android:largeHeap="true"
3031
android:theme="@style/Theme.Aegis.Launch"
3132
tools:targetApi="tiramisu">
3233
<activity android:name=".ui.TransferEntriesActivity"

‎app/src/main/assets/changelog.html

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@
3131
</head>
3232
<body>
3333
<div></div>
34+
<h3>Version 3.3.3</h3>
35+
<h4>Fixes</h4>
36+
<ul>
37+
<li>Some users ran into out of memory conditions due to large icons in their vault file. We've introduced a temporary measure that should help in most cases, but we'll follow up with a more comprehensive fix soon.</li>
38+
<li>Window insets were not always applied correctly, causing parts of the UI to appear off-screen</li>
39+
<li>The 2FAS importer did not tolerate spaces for secrets and was not always able to extract the issuer</li>
40+
</ul>
3441
<h3>Version 3.3.2</h3>
3542
<h4>New</h4>
3643
<ul>

‎app/src/main/res/values-gl-rES/strings.xml

+53-8
Large diffs are not rendered by default.

‎app/src/main/res/values-in-rID/strings.xml

+65-26
Large diffs are not rendered by default.

‎app/src/main/res/values-it-rIT/strings.xml

+10
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<string name="pref_section_security_summary">Configura la crittografia, lo sblocco biometrico, il blocco automatico e altre impostazioni di sicurezza.</string>
3030
<string name="pref_section_import_export_title">Importa / Esporta</string>
3131
<string name="pref_section_import_export_summary">Importa i backup di Aegis o di altre applicazioni di autenticazione. Crea esportazioni manuali della tua cassaforte di Aegis.</string>
32+
<string name="pref_section_audit_log_summary">Trova un elenco di tutti gli eventi importanti segnalati che sono avvenuti nell\'app.</string>
3233
<string name="pref_section_backups_title">Backup</string>
3334
<string name="pref_section_backups_summary">Imposta i backup automatici in una posizione a tua scelta o abilita la partecipazione al sistema di backup cloud di Android.</string>
3435
<string name="pref_section_icon_packs">Pacchetti di icone</string>
@@ -43,6 +44,11 @@
4344
<string name="pref_code_group_size_title">Raggruppamento delle cifre dei codici</string>
4445
<string name="pref_code_group_size_summary">Seleziona il numero di cifre per cui raggruppare i codici</string>
4546
<string name="pref_account_name_position_title">Mostra il nome dell\'account</string>
47+
<string name="pref_show_next_code_title">Mostra il codice successivo</string>
48+
<string name="pref_show_next_code_summary">Genera e mostra il codice successivo in anticipo</string>
49+
<string name="pref_expiration_state_title">Mostra quando qualche codice sta per scadere</string>
50+
<string name="pref_expiration_state_summary">Cambia il colore e fa\' lampeggiare i codici che stanno per scadere</string>
51+
<string name="pref_expiration_state_fallback">Cambia il colore dei codici quando stanno per scadere</string>
4652
<string name="pref_shared_issuer_account_name_title">Mostra il nome dell\'account solo se necessario</string>
4753
<string name="pref_shared_issuer_account_name_summary">Mostra i nomi degli account quando condividono lo stesso servizio. I nomi degli altri account verranno nascosti.</string>
4854
<string name="pref_import_file_title">Importa da un file</string>
@@ -56,7 +62,11 @@
5662
<string name="pref_backups_reminder_summary">Mostra un promemoria per effettuare il backup della cassaforte nel caso in cui non sia stato fatto dopo le ultime modifiche.</string>
5763
<string name="pref_backups_reminder_dialog_title">Disabilita i promemoria di backup</string>
5864
<string name="pref_backups_reminder_dialog_summary">Se disabiliti i promemoria, Aegis non ti avviserà delle eventuali modifiche di cui non hai ancora effettuato il backup. Ciò comporta il rischio di perdere l\'accesso ai tuoi token. Sei sicuro di voler disabilitare i promemoria?</string>
65+
<string name="pref_backups_versioning_strategy_title">Strategia di backup</string>
66+
<string name="pref_backups_versioning_strategy_single_backup">Backup singolo</string>
67+
<string name="pref_backups_versioning_strategy_dialog_title">Seleziona una strategia di backup</string>
5968
<string name="pref_backups_location_summary">I backup saranno salvati in</string>
69+
<string name="pref_backup_location_summary">I backup saranno salvati in</string>
6070
<string name="pref_backups_trigger_title">Effettua un backup</string>
6171
<string name="pref_backups_trigger_summary">Effettua un backup manualmente</string>
6272
<string name="pref_backups_versions_title">Numero di versioni da salvare</string>

‎app/src/main/res/values-sv-rSE/strings.xml

+10
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,14 @@
6464
<string name="pref_backups_reminder_summary">Visa en påminnelse om att säkerhetskopiera ditt valv ifall du inte har säkerhetskopierat dina senaste ändringar.</string>
6565
<string name="pref_backups_reminder_dialog_title">Inaktivera påminnelse om säkerhetskopiering</string>
6666
<string name="pref_backups_reminder_dialog_summary">Inaktivering av denna påminnelse innebär att Aegis inte kommer att meddela dig om du har ändringar som ännu inte har säkerhetskopierats. Detta utsätter dig för risken att förlora åtkomst till dina polletter. Är du säker på att du vill inaktivera påminnelsen?</string>
67+
<string name="pref_backups_versioning_strategy_title">Strategi för säkerhetskopiering</string>
68+
<string name="pref_backups_versioning_strategy_keep_x_versions">Behåll ett antal versioner</string>
69+
<string name="pref_backups_versioning_strategy_single_backup">Enstaka säkerhetskopia</string>
70+
<string name="pref_backups_versioning_strategy_single_backup_warning">Den valda strategin för säkerhetskopiering är inte tillförlitlig och rekommenderas inte. Ett enda säkerhetskopieringsfel kan leda till att du förlorar din enda säkerhetskopia.</string>
71+
<string name="pref_backups_versioning_strategy_dialog_title">Välj en strategi för säkerhetskopiering</string>
72+
<string name="pref_backups_location_title">Plats för säkerhetskopior</string>
6773
<string name="pref_backups_location_summary">Säkerhetskopior kommer att lagras i</string>
74+
<string name="pref_backup_location_summary">Säkerhetskopia kommer att lagras i</string>
6875
<string name="pref_backups_trigger_title">Skapa säkerhetskopia</string>
6976
<string name="pref_backups_trigger_summary">Skapa en säkerhetskopia manuellt</string>
7077
<string name="pref_backups_versions_title">Antal versioner att behålla</string>
@@ -499,7 +506,10 @@
499506
<string name="importer_help_battle_net_authenticator">Tillhandahåll en kopia av <b>/data/data/com.blizzard.messenger/shared_prefs/com.blizzard.messenger.authenticator_preferences.xml</b>, som finns i den interna lagringskatalogen för Battle.net Authenticator.</string>
500507
<string name="importer_help_duo">Tillhandahåll en kopia av <b>/data/data/com.duosecurity.duomobile/files/duokit/accounts.json</b>, som finns i den interna lagringskatalogen för DUO.</string>
501508
<string name="importer_help_ente_auth">Tillhandahåll en exportfil från Ente Auth. För närvarande stöds endast okrypterade filer.</string>
509+
<string name="importer_help_freeotp">FreeOTP 2: Tillhandahåll en säkerhetskopiefil.\nFreeOTP 1.x: Tillhandahåll en kopia av <b>/data/data/org.fedorahosted.freeotp/shared_prefs/tokens.xml</b>, som finns i den interna lagringskatalogen för FreeOTP.</string>
502510
<string name="importer_help_freeotp_plus">Tillhandahåll en exportfil från FreeOTP+.</string>
511+
<string name="importer_warning_title_freeotp2">FreeOTP 2-kompatibilitet</string>
512+
<string name="importer_warning_message_freeotp2">Det finns ett antal problem i FreeOTP 2 som kan resultera i korrupta säkerhetskopior. Aegis kommer att försöka att rädda så många poster som möjligt, men det är möjligt att vissa eller till och med alla av dem inte kan importeras.</string>
503513
<string name="importer_help_google_authenticator"><b>Endast databasfiler från Google Authenticator v5.10 och tidigare stöds.</b>\n\nTillhandahåll en kopia av <b>/data/data/com.google.android.apps.authenticator2/databases/databases</b>, som finns i den interna lagringskatalogen för Google Authenticator.</string>
504514
<string name="importer_help_microsoft_authenticator">Tillhandahåll en kopia av <b>/data/data/com.azure.authenticator/databases/PhoneFactor</b>, som finns i den interna lagringskatalogen för Microsoft Authenticator.</string>
505515
<string name="importer_help_plain_text">Tillhandahåll en klartextfil med en Google Authenticator-URI per rad.</string>

‎app/src/main/res/values-zh-rTW/strings.xml

+5
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@
5757
<string name="pref_backups_reminder_title">備份提醒</string>
5858
<string name="pref_backups_reminder_summary">提示您備份保險箱以避免最後的變更狀態未被加入備份。</string>
5959
<string name="pref_backups_reminder_dialog_title">關閉備份提醒</string>
60+
<string name="pref_backups_versioning_strategy_title">備份策略</string>
61+
<string name="pref_backups_versioning_strategy_dialog_title">選擇備份策略</string>
62+
<string name="pref_backups_location_title">備份位置</string>
6063
<string name="pref_backups_location_summary">備份將儲存在</string>
6164
<string name="pref_backups_trigger_title">觸發備份</string>
6265
<string name="pref_backups_trigger_summary">手動觸發備份</string>
6366
<string name="pref_backups_versions_title">保留的版本數</string>
67+
<string name="pref_backups_versions_infinite">\u221E</string>
6468
<plurals name="pref_backups_versions_summary">
6569
<item quantity="other">保留 %1$d 個備份</item>
6670
</plurals>
@@ -115,6 +119,7 @@
115119
<string name="event_description_entry_shared">已分享一筆資料</string>
116120
<string name="event_title_vault_unlock_failed_password">密碼庫解鎖失敗（密碼）</string>
117121
<string name="event_title_vault_unlock_failed_biometrics">密碼庫解鎖失敗（生物特徵辨識）</string>
122+
<string name="event_unknown">未知的事件類型</string>
118123
<string name="audit_log_entry_deleted">（已刪除）</string>
119124
<string name="today_at_time">今天 %1$s</string>
120125
<string name="day_of_week_at_time">%1$s 的 %2$s</string>

0 commit comments

Comments
 (0)