mirror of
https://github.com/beemdevelopment/Aegis.git
synced 2025-05-14 14:02:49 +00:00
Change the layout of the entry delete dialog and include more info
This commit is contained in:
Praveen Kumar
Alexander Bakker
parent
adfc472a39
commit
c0020684de
25 changed files with 38 additions and 46 deletions
|
|
@ -71,11 +71,8 @@ public class Dialogs {
|
|||
TextView textMessage = view.findViewById(R.id.text_message);
|
||||
TextView textExplanation = view.findViewById(R.id.text_explanation);
|
||||
String entries = services.stream()
|
||||
.map(entry -> !entry.getIssuer().isEmpty() ? entry.getIssuer()
|
||||
: !entry.getName().isEmpty() ? entry.getName()
|
||||
: activity.getString(R.string.unknown_issuer)
|
||||
)
|
||||
.collect(Collectors.joining(", "));
|
||||
.map(entry -> String.format("• %s", getVaultEntryName(activity, entry)))
|
||||
.collect(Collectors.joining("\n"));
|
||||
textExplanation.setText(activity.getString(R.string.delete_entry_explanation, entries));
|
||||
|
||||
String title, message;
|
||||
|
|
@ -96,6 +93,18 @@ public class Dialogs {
|
|||
.create());
|
||||
}
|
||||
|
||||
private static String getVaultEntryName(Context context, VaultEntry entry) {
|
||||
if (!entry.getIssuer().isEmpty() && !entry.getName().isEmpty()) {
|
||||
return String.format("%s (%s)", entry.getIssuer(), entry.getName());
|
||||
} else if (entry.getIssuer().isEmpty() && entry.getName().isEmpty()) {
|
||||
return context.getString(R.string.unknown_issuer);
|
||||
} else if (entry.getIssuer().isEmpty()) {
|
||||
return entry.getName();
|
||||
} else {
|
||||
return entry.getIssuer();
|
||||
}
|
||||
}
|
||||
|
||||
public static void showDiscardDialog(Activity activity, DialogInterface.OnClickListener onSave, DialogInterface.OnClickListener onDiscard) {
|
||||
showSecureDialog(new AlertDialog.Builder(activity)
|
||||
.setTitle(activity.getString(R.string.discard_changes))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<ScrollView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="25dp"
|
||||
android:paddingBottom="10dp"
|
||||
android:paddingEnd="25dp"
|
||||
|
|
@ -18,4 +22,5 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:textSize="16sp"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
|
|
|||
|
|
@ -142,7 +142,6 @@
|
|||
<string name="reading_file">Четене на файла</string>
|
||||
<string name="delete_entry">Изтрий запис</string>
|
||||
<string name="delete_entry_description">Сигурни ли сте, че искате да изтриете този запис?</string>
|
||||
<string name="delete_entry_explanation">Това действие не деактивира 2FA за <b>%s</b>. За да предотвратите загуба на достъп, уверете се, че сте деактивирали 2FA или че имате алтернативен начин за генериране на кодове за тази услуга.</string>
|
||||
<string name="delete_entries">Изтрий записите</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Наистина ли искате да изтриете %d записа?</item>
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@
|
|||
<string name="importing_icon_pack">Importování balíčku ikon</string>
|
||||
<string name="delete_entry">Odstranit položku</string>
|
||||
<string name="delete_entry_description">Opravdu chcete odstranit tuto položku?</string>
|
||||
<string name="delete_entry_explanation">Tato akce nezakáže 2FA pro službu <b>%s</b>. Abyste zabránili ztrátě přístupu, ujistěte se, že jste zakázali 2FA nebo že máte jiný způsob generování kódů pro tuto službu.</string>
|
||||
<string name="delete_entries">Odstranit položky</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Opravdu chcete smazat %d položku?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Importerer ikonpakke</string>
|
||||
<string name="delete_entry">Slet post</string>
|
||||
<string name="delete_entry_description">Er du sikker på, du vil slette denne post?</string>
|
||||
<string name="delete_entry_explanation">Denne handling deaktiverer ikke 2FA for <b>%s</b>. For at undgå at miste adgang, skal du sørge for, at du har deaktiveret 2FA eller at du har en alternativ måde at generere koder til denne tjeneste.</string>
|
||||
<string name="delete_entries">Slet poster</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Er du sikker på, du vil slette %d post?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Symbolpaket wird importiert</string>
|
||||
<string name="delete_entry">Eintrag löschen</string>
|
||||
<string name="delete_entry_description">Bist du sicher, dass du diesen Eintrag löschen möchtest?</string>
|
||||
<string name="delete_entry_explanation">Diese Aktion deaktiviert nicht die 2FA für <b>%s</b>. Um zu verhindern, dass du den Zugriff verlierst, stelle sicher, dass du 2FA deaktiviert hast oder dass du eine alternative Möglichkeit verwendest, um Codes für diesen Dienst zu generieren.</string>
|
||||
<string name="delete_entries">Einträge löschen</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Bist du sicher, dass du %d Eintrag löschen möchtest?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Εισαγωγή πακέτου εικονιδίων</string>
|
||||
<string name="delete_entry">Διαγραφή καταχώρησης</string>
|
||||
<string name="delete_entry_description">Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή την καταχώρηση;</string>
|
||||
<string name="delete_entry_explanation">Αυτή η ενέργεια δεν απενεργοποιεί το 2FA για <b>%s</b>. Για να αποτρέψετε την απώλεια πρόσβασης, βεβαιωθείτε ότι έχετε απενεργοποιήσει το 2FA ή ότι έχετε έναν εναλλακτικό τρόπο να δημιουργήσετε κωδικούς για αυτήν την υπηρεσία.</string>
|
||||
<string name="delete_entries">Διαγραφή καταχωρήσεων</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Είστε βέβαιοι ότι θέλετε να διαγράψετε %d καταχώρηση;</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Importando paquete de iconos</string>
|
||||
<string name="delete_entry">Eliminar entrada</string>
|
||||
<string name="delete_entry_description">¿Está seguro de que desea eliminar esta entrada?</string>
|
||||
<string name="delete_entry_explanation">Esta acción no desactiva 2FA para <b>%s</b>. Para evitar la pérdida de acceso, asegúrese de haber desactivado 2FA o de tener una forma alternativa de generar códigos para este servicio.</string>
|
||||
<string name="delete_entries">Eliminar entradas</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">¿Está seguro de que desea eliminar %d entrada?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Ikono multzoa inportatzen</string>
|
||||
<string name="delete_entry">Ezabatu sarrera</string>
|
||||
<string name="delete_entry_description">Ziur al zaude sarrera hau ezabatu nahi duzula?</string>
|
||||
<string name="delete_entry_explanation">Akzio honek ez du <b>%s</b> zerbitzuaren 2FA desgaitzen. Sartzen jarraitzeko desaktibatu 2FA edo ziurtatu beste era batera sartu zaitezkeela.</string>
|
||||
<string name="delete_entries">Ezabatu sarrerak</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Ziur al zaude %d sarrera ezabatu nahi duzula?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Import du pack d\'icônes</string>
|
||||
<string name="delete_entry">Supprimer entrée</string>
|
||||
<string name="delete_entry_description">Êtes-vous sûr de vouloir supprimer cette entrée ?</string>
|
||||
<string name="delete_entry_explanation">Cette action ne désactive pas l\'A2F pour <b>%s</b>. Pour éviter de perdre l\'accès, assurez-vous que vous avez désactivé l\'A2F ou que vous avez un autre moyen de générer des codes pour ce service.</string>
|
||||
<string name="delete_entries">Supprimer les entrées</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Êtes-vous sûr de vouloir supprimer %d entrée ?</item>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@
|
|||
<string name="importing_icon_pack">Impor paket ikon</string>
|
||||
<string name="delete_entry">Hapus entri</string>
|
||||
<string name="delete_entry_description">Apakah Anda yakin ingin menghapus entri ini?</string>
|
||||
<string name="delete_entry_explanation">Tindakan ini tidak mematikan 2FA untuk <b>%s</b>. Untuk menghidari kehilangan akses, pastikan bahwa Anda sudah mematikan 2FA atau Anda memiliki cara alternatif untuk menghasilkan kode untuk layanan ini.</string>
|
||||
<string name="delete_entries">Hapus catatan</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="other">Apakah Anda yakin ingin menghapus %d entri ini?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Importando pacchetto icone</string>
|
||||
<string name="delete_entry">Elimina elemento</string>
|
||||
<string name="delete_entry_description">Sei sicuro di voler eliminare questa voce?</string>
|
||||
<string name="delete_entry_explanation">L\'autenticazione a due fattori di <b>%s</b> non verrà disabilitata. Per evitare di perdere l\'accesso al tuo account, assicurati di avere disabilitato l\'autenticazione a due fattori o di avere un altro modo per generare codici per questo servizio.</string>
|
||||
<string name="delete_entries">Elimina elemento</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Sei sicuro di voler eliminare %d elemento?</item>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@
|
|||
<string name="importing_icon_pack">アイコンパックをインポート中</string>
|
||||
<string name="delete_entry">エントリーを削除</string>
|
||||
<string name="delete_entry_description">このエントリーを削除してもよろしいですか？</string>
|
||||
<string name="delete_entry_explanation">この操作は、<b>%s</b>の2FAを無効にするものではありません。アクセスできなくなるのを防ぐために、2FAを無効にするか、このサービスのコードを生成する別の方法を用意してください。</string>
|
||||
<string name="delete_entries">エントリーを削除</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="other">%d 件のエントリーを削除してもよろしいですか？</item>
|
||||
|
|
|
|||
|
|
@ -115,7 +115,6 @@
|
|||
<string name="encrypting_vault">Šifruojama slėptuvė</string>
|
||||
<string name="delete_entry">Ištrinti įrašą</string>
|
||||
<string name="delete_entry_description">Ar tikrai norite ištrinti šį įrašą?</string>
|
||||
<string name="delete_entry_explanation">Šis veiksmas neišjungia dviejų faktorių tapatybės nustatymo (2FA), skirto <b>%s</b>. Norėdami neprarasti prieigos, įsitikinkite, kad esate išjungę 2FA arba, kad turite kitą būdą kaip galite sugeneruoti kodus šiai paslaugai.</string>
|
||||
<string name="delete_entries">Ištrinti įrašus</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Ar tikrai norite ištrinti %d įrašą?</item>
|
||||
|
|
|
|||
|
|
@ -150,7 +150,6 @@
|
|||
<string name="importing_icon_pack">Ievieto ikonu pakotni</string>
|
||||
<string name="delete_entry">Dzēst ierakstu</string>
|
||||
<string name="delete_entry_description">Vai tiešām izdzēst šo ierakstu?</string>
|
||||
<string name="delete_entry_explanation">Šī darbība neatspējo <b>%s</b> 2FA. Lai novērstu piekļuves zaudēšanu, jāpārliecinās, ka ir atspējots 2FA vai ka ir cits veids, kā izveidot kodus šim pakalpojumam.</string>
|
||||
<string name="delete_entries">Dzēst ierakstus</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="zero">Vai tiešām izdēst %d ierakstu?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Pictogrampakket importeren</string>
|
||||
<string name="delete_entry">Item verwijderen</string>
|
||||
<string name="delete_entry_description">Weet je zeker dat je dit item wilt verwijderen?</string>
|
||||
<string name="delete_entry_explanation">Deze actie schakelt 2FA voor <b>%s</b> niet uit. Om te voorkomen dat u de toegang verliest, zorg ervoor dat u 2FA hebt uitgeschakeld of dat u een alternatieve manier hebt om codes voor deze dienst te genereren.</string>
|
||||
<string name="delete_entries">Items verwijderen</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Weet je zeker dat je het item %d wilt verwijderen?</item>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@
|
|||
<string name="importing_icon_pack">Importowanie pakietu ikon</string>
|
||||
<string name="delete_entry">Usuń wpis</string>
|
||||
<string name="delete_entry_description">Czy na pewno chcesz usunąć ten wpis?</string>
|
||||
<string name="delete_entry_explanation">Ta akcja nie wyłącza uwierzytelniania dwustopniowego dla <b>%s</b>. Aby zapobiec utracie dostępu, upewnij się, że dla tej usługi wyłączyłeś uwierzytelnianie lub posiadasz alternatywny sposób generowania kodów.</string>
|
||||
<string name="delete_entries">Usuń wpisy</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Czy na pewno chcesz usunąć %d wpis?</item>
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@
|
|||
<string name="importing_icon_pack">Importando pacote de ícones</string>
|
||||
<string name="delete_entry">Deletar entrada</string>
|
||||
<string name="delete_entry_description">Você tem certeza que deseja deletar essa entrada?</string>
|
||||
<string name="delete_entry_explanation">Esta ação não desativa a 2FA para <b>%s</b>. Para evitar a perda de acesso, certifique-se de ter desabilitado a 2FA ou de ter uma maneira alternativa de gerar códigos para este serviço.</string>
|
||||
<string name="delete_entries">Deletar entradas</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Você tem certeza que deseja deletar %d entrada?</item>
|
||||
|
|
|
|||
|
|
@ -150,7 +150,6 @@
|
|||
<string name="importing_icon_pack">Se importă pachetul de pictograme</string>
|
||||
<string name="delete_entry">Ștergere intrare</string>
|
||||
<string name="delete_entry_description">Ești sigur că dorești să ştergi această intrare?</string>
|
||||
<string name="delete_entry_explanation">Această acțiune nu dezactivează 2FA pentru <b>%s</b>. Pentru a preveni pierderea accesului, asigurați-vă că ați dezactivat 2FA sau că aveți o modalitate alternativă de a genera coduri pentru acest serviciu.</string>
|
||||
<string name="delete_entries">Ştergere intrări</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Sigur vrei să ștergi %d element?</item>
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@
|
|||
<string name="importing_icon_pack">Импорт набора значков</string>
|
||||
<string name="delete_entry">Удалить запись</string>
|
||||
<string name="delete_entry_description">Удалить эту запись?</string>
|
||||
<string name="delete_entry_explanation">Это действие не отключает 2FA в <b>%s</b>. Чтобы не потерять доступ, убедитесь, что вы отключили 2FA или у вас есть альтернативный способ генерации кодов для данной сервиса.</string>
|
||||
<string name="delete_entries">Удалить записи</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Удалить %d запись?</item>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@
|
|||
<string name="importing_icon_pack">İkon paketi içe aktarılıyor</string>
|
||||
<string name="delete_entry">Girdiyi sil</string>
|
||||
<string name="delete_entry_description">Bu girdiyi silmek istediğinize emin misiniz?</string>
|
||||
<string name="delete_entry_explanation">Bu eylem <b>%s</b> için çift faktörlü doğrulamayı devre dışı bırakmaz. Erişiminizi kaybetmeyi önlemek için, çift faktörlü doğrulamayı devre dışı bıraktığınıza veya bu hizmet için başka bir kod oluşturma yöntemine sahip olduğunuza emin olun.</string>
|
||||
<string name="delete_entries">Girdileri sil</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">%d girdisini silmek istediğinize emin misiniz?</item>
|
||||
|
|
|
|||
|
|
@ -144,7 +144,6 @@
|
|||
<string name="reading_file">Читання файлу</string>
|
||||
<string name="delete_entry">Видалити запис</string>
|
||||
<string name="delete_entry_description">Ви впевнені, що хочете видалити цей запис?</string>
|
||||
<string name="delete_entry_explanation">Ця дія не вимикає двофакторну автентифікацію (2FA) для <b>%s</b>. Щоб запобігти втраті доступу, переконайтеся, що ви вимкнули 2FA або ж у вас є альтернативний спосіб генерування кодів для цієї служби.</string>
|
||||
<string name="delete_entries">Видалити записи</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Ви впевнені, що хочете видалити %d запис?</item>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@
|
|||
<string name="importing_icon_pack">Đang nhập gói biểu tượng</string>
|
||||
<string name="delete_entry">Xóa mục</string>
|
||||
<string name="delete_entry_description">Bạn có chắc bạn muốn xóa mục này không?</string>
|
||||
<string name="delete_entry_explanation">Hành động này không tắt Xác thực 2 yếu tố cho <b>%s</b>. Để tránh việc mất quyền truy cập, hãy chắc chắn rằng bạn đã tắt Xác thực 2 yếu tố hoặc bạn có một cách khác để tạo các mã cho dịch vụ này.</string>
|
||||
<string name="delete_entries">Xoá các mục</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="other">Bạn có chắc bạn muốn xoá %d mục không?</item>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@
|
|||
<string name="importing_icon_pack">导入图标包</string>
|
||||
<string name="delete_entry">删除条目</string>
|
||||
<string name="delete_entry_description">您确定要删除此条目吗？</string>
|
||||
<string name="delete_entry_explanation">此操作不会对 <b>%s</b> 禁用2FA。 为了防止失去访问权限，请确保您已禁用 2FA 或者您有其他方式为此服务生成代码。</string>
|
||||
<string name="delete_entries">删除条目</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="other">您确定要删除 %d 个项目吗？</item>
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@
|
|||
<string name="importing_icon_pack">Importing icon pack</string>
|
||||
<string name="delete_entry">Delete entry</string>
|
||||
<string name="delete_entry_description">Are you sure you want to delete this entry?</string>
|
||||
<string name="delete_entry_explanation">This action does not disable 2FA for <b>%s</b>. To prevent losing access, make sure that you have disabled 2FA or that you have an alternative way to generate codes for this service.</string>
|
||||
<string name="delete_entry_explanation">This action does not disable 2FA for:\n<b>%s</b>\n\nTo prevent losing access, make sure that you have disabled 2FA or that you have an alternative way to generate codes for this service.</string>
|
||||
<string name="delete_entries">Delete entries</string>
|
||||
<plurals name="delete_entries_description">
|
||||
<item quantity="one">Are you sure you want to delete %d entry?</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue