projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing contacts from main app
[pub/Android/ownCloud.git]
/
src
/
eu
/
alefzero
/
owncloud
/
ui
/
activity
/
FileDisplayActivity.java
diff --git
a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index
5ae763c
..
a543777
100644
(file)
--- a/
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@
-155,12
+155,11
@@
public class FileDisplayActivity extends SherlockFragmentActivity implements
\r
@Override
\r
public void onBackPressed(){
\r
\r
@Override
\r
public void onBackPressed(){
\r
- popPath();
\r
- if(mDirectories.getCount() == 0) {
\r
- Intent intent = new Intent(this, LandingActivity.class);
\r
- startActivity(intent);
\r
+ if(mDirectories.getCount() == 1) {
\r
+ finish();
\r
return;
\r
}
\r
return;
\r
}
\r
+ popPath();
\r
((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))
\r
.onNavigateUp();
\r
}
\r
((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))
\r
.onNavigateUp();
\r
}
\r