Merge pull request #1466 from alexbakker/fix-audit-log-crash

Account for audit log entries that reference deleted entries

app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/AuditLogPreferencesFragment.java

@@ -6,10 +6,8 @@ import android.view.View;
 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 class AuditLogPreferencesFragment extends Fragment {
             _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);

app/src/main/java/com/beemdevelopment/aegis/ui/views/AuditLogHolder.java

@@ -61,6 +61,10 @@ public class AuditLogHolder extends RecyclerView.ViewHolder {
         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);
         }

app/src/main/java/com/beemdevelopment/aegis/vault/VaultRepository.java

@@ -225,6 +225,10 @@ public class VaultRepository {
         _vault.getEntries().add(entry);
     }
 
+    public boolean hasEntryByUUID(UUID uuid) {
+        return _vault.getEntries().has(uuid);
+    }
+
     public VaultEntry getEntryByUUID(UUID uuid) {
         return _vault.getEntries().getByUUID(uuid);
     }

app/src/main/res/values/strings.xml

@@ -127,6 +127,7 @@
     <string name="event_title_vault_unlock_failed_biometrics">Vault unlock failed (biometrics)</string>
     <string name="event_description_vault_unlock_failed_biometrics">An attempt to unlock the vault with biometrics failed</string>
     <string name="event_unknown">Unknown event type</string>
+    <string name="audit_log_entry_deleted">(deleted)</string>
 
     <string name="today_at_time">Today at %1$s</string>
     <string name="day_of_week_at_time">%1$s at %2$s</string>