X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1ecd2b61c5956f7e21ee85d5658f4bc83032656f..5fc7cd13e7e561ef528e12d2fa088b58e35e00d0:/src/com/owncloud/android/ui/activity/UploadFilesActivity.java diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index aca4d896..7382d798 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -88,6 +88,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements setContentView(R.layout.upload_files_layout); mFileListFragment = (LocalFileListFragment) getSupportFragmentManager().findFragmentById(R.id.local_files_list); + // Set input controllers mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel); mCancelBtn.setOnClickListener(this); @@ -164,17 +165,6 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements Log.d(TAG, "onSaveInstanceState() end"); } - @Override - protected void onResume() { - Log.d(TAG, "onResume() start"); - super.onResume(); - - // List current directory - mFileListFragment.listDirectory(mCurrentDir); - - Log.d(TAG, "onResume() end"); - } - /** * Pushes a directory to the drop down list @@ -244,6 +234,14 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements public void onFileClick(File file) { // nothing to do } + + /** + * {@inheritDoc} + */ + @Override + public File getInitialDirectory() { + return mCurrentDir; + } /**