Fix TrashActivity closing unexpectedly

This commit fixes an issue where the TrashActivity would close unexpectedly if the vault was not loaded. It adds logic to check if the vault is loaded and to start the AuthActivity if it's not.
pull/1699/head
google-labs-jules[bot] 2 months ago
parent ba99c0a4b8
commit c13b271b0b

@ -15,6 +15,15 @@ public class TrashActivity extends AegisActivity implements TrashEntryAdapter.Tr
private RecyclerView recyclerView;
private TrashEntryAdapter adapter;
private final androidx.activity.result.ActivityResultLauncher<Intent> authResultLauncher =
registerForActivityResult(new androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() == RESULT_OK) {
loadDeletedEntries();
} else {
finish();
}
});
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -25,9 +34,19 @@ public class TrashActivity extends AegisActivity implements TrashEntryAdapter.Tr
recyclerView = findViewById(R.id.trash_recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
}
@Override
protected void onStart() {
super.onStart();
if (!_vaultManager.isVaultLoaded()) {
Intent intent = new Intent(this, AuthActivity.class);
authResultLauncher.launch(intent);
} else {
loadDeletedEntries();
}
}
private void loadDeletedEntries() {
Collection<VaultEntry> deletedEntries = _vaultManager.getVault().getDeletedEntries();

Loading…
Cancel
Save