diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java index cabbbd614..daa722a84 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java @@ -6,10 +6,8 @@ import android.widget.LinearLayout; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.lifecycle.LiveData; -import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -64,10 +62,12 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { _noAuditLogsView.setVisibility(entries1.isEmpty() ? View.VISIBLE : View.GONE); for (AuditLogEntry entry : entries1) { - VaultEntry referencedEntry = null; if (entry.getReference() != null) { - referencedEntry = _vaultManager.getVault().getEntryByUUID(UUID.fromString(entry.getReference())); + UUID referencedEntryUUID = UUID.fromString(entry.getReference()); + if (_vaultManager.getVault().hasEntryByUUID(referencedEntryUUID)) { + referencedEntry = _vaultManager.getVault().getEntryByUUID(referencedEntryUUID); + } } AuditLogEntryModel auditLogEntryModel = new AuditLogEntryModel(entry, referencedEntry); diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java index 9dd1a82c4..e0ae166cf 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java @@ -61,6 +61,10 @@ public void setData(AuditLogEntryModel auditLogEntryModel) { if (auditLogEntryModel.getReferencedVaultEntry() != null) { VaultEntry referencedVaultEntry = auditLogEntryModel.getReferencedVaultEntry(); _auditLogEntryReference.setText(String.format("%s (%s)", referencedVaultEntry.getIssuer(), referencedVaultEntry.getName())); + _auditLogEntryReference.setVisibility(View.VISIBLE); + } else if (auditLogEntryModel.getAuditLogEntry().getReference() != null) { + _auditLogEntryReference.setText(R.string.audit_log_entry_deleted); + _auditLogEntryReference.setVisibility(View.VISIBLE); } else { _auditLogEntryReference.setVisibility(View.GONE); } diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java index 81e1e5309..4044a6fed 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java +++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java @@ -225,6 +225,10 @@ public void addEntry(VaultEntry entry) { _vault.getEntries().add(entry); } + public boolean hasEntryByUUID(UUID uuid) { + return _vault.getEntries().has(uuid); + } + public VaultEntry getEntryByUUID(UUID uuid) { return _vault.getEntries().getByUUID(uuid); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc455a25e..56772ec1a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -127,6 +127,7 @@ Vault unlock failed (biometrics) An attempt to unlock the vault with biometrics failed Unknown event type + (deleted) Today at %1$s %1$s at %2$s