Skip to content
Snippets Groups Projects
Commit 0db8737e authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Exit Subs picker on back at 'Home' level

Close #307
parent 6da9696a
No related branches found
No related tags found
No related merge requests found
......@@ -115,6 +115,7 @@ public class FileBrowserFragment<T extends BaseBrowserAdapter> extends BaseBrows
}
});
mHandler.sendEmptyMessage(BrowserFragmentHandler.MSG_HIDE_LOADING);
mRoot = true;
}
});
}
......
......@@ -44,11 +44,13 @@ public class FilePickerActivity extends AppCompatActivity {
@Override
public void onBackPressed() {
if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
FilePickerFragment fpf = ((FilePickerFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_placeholder));
if (fpf.isRootDirectory())
finish();
else if (getSupportFragmentManager().getBackStackEntryCount() > 0)
super.onBackPressed();
} else {
((FilePickerFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_placeholder)).browseUp();
}
else
fpf.browseUp();
}
public void onHomeClick(View v) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment