Skip to content

Commit

Permalink
Merge branch 'beemdevelopment:master' into feature/multiselect-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelschattgen authored Jan 4, 2025
2 parents fd0dcaf + 81a26cc commit 1584f4f
Show file tree
Hide file tree
Showing 9 changed files with 154 additions and 36 deletions.
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
actions: read
contents: read
security-events: write
if: github.event_name != 'schedule' || github.repository == 'beemdevelopment/Aegis'
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ android {
applicationId "${packageName}"
minSdkVersion 21
targetSdkVersion 35
versionCode 75
versionName "3.3.2"
versionCode 76
versionName "3.3.3"
multiDexEnabled true
buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
buildConfigField "String", "GIT_BRANCH", "\"${getGitBranch()}\""
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
android:icon="@mipmap/${iconName}"
android:label="Aegis"
android:supportsRtl="true"
android:largeHeap="true"
android:theme="@style/Theme.Aegis.Launch"
tools:targetApi="tiramisu">
<activity android:name=".ui.TransferEntriesActivity"
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/assets/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
</head>
<body>
<div></div>
<h3>Version 3.3.3</h3>
<h4>Fixes</h4>
<ul>
<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>
<li>Window insets were not always applied correctly, causing parts of the UI to appear off-screen</li>
<li>The 2FAS importer did not tolerate spaces for secrets and was not always able to extract the issuer</li>
</ul>
<h3>Version 3.3.2</h3>
<h4>New</h4>
<ul>
Expand Down
61 changes: 53 additions & 8 deletions app/src/main/res/values-gl-rES/strings.xml

Large diffs are not rendered by default.

91 changes: 65 additions & 26 deletions app/src/main/res/values-in-rID/strings.xml

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions app/src/main/res/values-it-rIT/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="pref_section_security_summary">Configura la crittografia, lo sblocco biometrico, il blocco automatico e altre impostazioni di sicurezza.</string>
<string name="pref_section_import_export_title">Importa / Esporta</string>
<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>
<string name="pref_section_audit_log_summary">Trova un elenco di tutti gli eventi importanti segnalati che sono avvenuti nell\'app.</string>
<string name="pref_section_backups_title">Backup</string>
<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>
<string name="pref_section_icon_packs">Pacchetti di icone</string>
Expand All @@ -43,6 +44,11 @@
<string name="pref_code_group_size_title">Raggruppamento delle cifre dei codici</string>
<string name="pref_code_group_size_summary">Seleziona il numero di cifre per cui raggruppare i codici</string>
<string name="pref_account_name_position_title">Mostra il nome dell\'account</string>
<string name="pref_show_next_code_title">Mostra il codice successivo</string>
<string name="pref_show_next_code_summary">Genera e mostra il codice successivo in anticipo</string>
<string name="pref_expiration_state_title">Mostra quando qualche codice sta per scadere</string>
<string name="pref_expiration_state_summary">Cambia il colore e fa\' lampeggiare i codici che stanno per scadere</string>
<string name="pref_expiration_state_fallback">Cambia il colore dei codici quando stanno per scadere</string>
<string name="pref_shared_issuer_account_name_title">Mostra il nome dell\'account solo se necessario</string>
<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>
<string name="pref_import_file_title">Importa da un file</string>
Expand All @@ -56,7 +62,11 @@
<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>
<string name="pref_backups_reminder_dialog_title">Disabilita i promemoria di backup</string>
<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>
<string name="pref_backups_versioning_strategy_title">Strategia di backup</string>
<string name="pref_backups_versioning_strategy_single_backup">Backup singolo</string>
<string name="pref_backups_versioning_strategy_dialog_title">Seleziona una strategia di backup</string>
<string name="pref_backups_location_summary">I backup saranno salvati in</string>
<string name="pref_backup_location_summary">I backup saranno salvati in</string>
<string name="pref_backups_trigger_title">Effettua un backup</string>
<string name="pref_backups_trigger_summary">Effettua un backup manualmente</string>
<string name="pref_backups_versions_title">Numero di versioni da salvare</string>
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/values-sv-rSE/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,14 @@
<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>
<string name="pref_backups_reminder_dialog_title">Inaktivera påminnelse om säkerhetskopiering</string>
<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>
<string name="pref_backups_versioning_strategy_title">Strategi för säkerhetskopiering</string>
<string name="pref_backups_versioning_strategy_keep_x_versions">Behåll ett antal versioner</string>
<string name="pref_backups_versioning_strategy_single_backup">Enstaka säkerhetskopia</string>
<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>
<string name="pref_backups_versioning_strategy_dialog_title">Välj en strategi för säkerhetskopiering</string>
<string name="pref_backups_location_title">Plats för säkerhetskopior</string>
<string name="pref_backups_location_summary">Säkerhetskopior kommer att lagras i</string>
<string name="pref_backup_location_summary">Säkerhetskopia kommer att lagras i</string>
<string name="pref_backups_trigger_title">Skapa säkerhetskopia</string>
<string name="pref_backups_trigger_summary">Skapa en säkerhetskopia manuellt</string>
<string name="pref_backups_versions_title">Antal versioner att behålla</string>
Expand Down Expand Up @@ -499,7 +506,10 @@
<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>
<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>
<string name="importer_help_ente_auth">Tillhandahåll en exportfil från Ente Auth. För närvarande stöds endast okrypterade filer.</string>
<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>
<string name="importer_help_freeotp_plus">Tillhandahåll en exportfil från FreeOTP+.</string>
<string name="importer_warning_title_freeotp2">FreeOTP 2-kompatibilitet</string>
<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>
<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>
<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>
<string name="importer_help_plain_text">Tillhandahåll en klartextfil med en Google Authenticator-URI per rad.</string>
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,14 @@
<string name="pref_backups_reminder_title">備份提醒</string>
<string name="pref_backups_reminder_summary">提示您備份保險箱以避免最後的變更狀態未被加入備份。</string>
<string name="pref_backups_reminder_dialog_title">關閉備份提醒</string>
<string name="pref_backups_versioning_strategy_title">備份策略</string>
<string name="pref_backups_versioning_strategy_dialog_title">選擇備份策略</string>
<string name="pref_backups_location_title">備份位置</string>
<string name="pref_backups_location_summary">備份將儲存在</string>
<string name="pref_backups_trigger_title">觸發備份</string>
<string name="pref_backups_trigger_summary">手動觸發備份</string>
<string name="pref_backups_versions_title">保留的版本數</string>
<string name="pref_backups_versions_infinite">\u221E</string>
<plurals name="pref_backups_versions_summary">
<item quantity="other">保留 %1$d 個備份</item>
</plurals>
Expand Down Expand Up @@ -115,6 +119,7 @@
<string name="event_description_entry_shared">已分享一筆資料</string>
<string name="event_title_vault_unlock_failed_password">密碼庫解鎖失敗(密碼)</string>
<string name="event_title_vault_unlock_failed_biometrics">密碼庫解鎖失敗(生物特徵辨識)</string>
<string name="event_unknown">未知的事件類型</string>
<string name="audit_log_entry_deleted">(已刪除)</string>
<string name="today_at_time">今天 %1$s</string>
<string name="day_of_week_at_time">%1$s 的 %2$s</string>
Expand Down

0 comments on commit 1584f4f

Please sign in to comment.