Fixes, improvements

This commit is contained in:
M66B
2018-08-12 15:31:43 +00:00
parent a46874130f
commit 633482ade7
17 changed files with 235 additions and 176 deletions

View File

@@ -92,7 +92,7 @@ public class FragmentFolders extends FragmentEx {
db.account().liveAccount(account).observe(getViewLifecycleOwner(), new Observer<EntityAccount>() {
@Override
public void onChanged(@Nullable EntityAccount account) {
setSubtitle(account.name);
setSubtitle(account == null ? null : account.name);
}
});
@@ -100,6 +100,11 @@ public class FragmentFolders extends FragmentEx {
db.folder().liveFolders(account).observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {
@Override
public void onChanged(@Nullable List<TupleFolderEx> folders) {
if (folders == null) {
getFragmentManager().popBackStack();
return;
}
adapter.set(folders);
pbWait.setVisibility(View.GONE);