X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e52df4a59e244f9665c06211f43c5a1628348f0b..e35e32ad52f3964a44f0f404adf699e0d18502de:/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 f93af1f3..d6665e2b 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -65,18 +65,18 @@ public class UploadFilesActivity extends FileActivity implements private ArrayAdapter mDirectories; private File mCurrentDir = null; - private LocalFileListFragment mFileListFragment; - private Button mCancelBtn; - private Button mUploadBtn; - private Account mAccountOnCreation; - private DialogFragment mCurrentDialog; + protected LocalFileListFragment mFileListFragment; + protected Button mCancelBtn; + protected Button mUploadBtn; + protected Account mAccountOnCreation; + protected DialogFragment mCurrentDialog; public static final String EXTRA_CHOSEN_FILES = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CHOSEN_FILES"; public static final int RESULT_OK_AND_MOVE = RESULT_FIRST_USER; - private static final String KEY_DIRECTORY_PATH = + public static final String KEY_DIRECTORY_PATH = UploadFilesActivity.class.getCanonicalName() + ".KEY_DIRECTORY_PATH"; private static final String TAG = "UploadFilesActivity"; private static final String WAIT_DIALOG_TAG = "WAIT"; @@ -91,8 +91,9 @@ public class UploadFilesActivity extends FileActivity implements super.onCreate(savedInstanceState); if(savedInstanceState != null) { - mCurrentDir = new File(savedInstanceState.getString( - UploadFilesActivity.KEY_DIRECTORY_PATH)); + mCurrentDir = new File(savedInstanceState.getString(KEY_DIRECTORY_PATH)); + } else if (getIntent() != null && getIntent().hasExtra(KEY_DIRECTORY_PATH)) { + mCurrentDir = new File(getIntent().getStringExtra(KEY_DIRECTORY_PATH)); } else { mCurrentDir = Environment.getExternalStorageDirectory(); }