X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5665d9c306165c144fc60b9749ac184cb32369c0..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/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 a6d61d18..7eff9b45 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,7 +25,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; import android.support.v4.app.DialogFragment; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; @@ -36,15 +34,16 @@ import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar.OnNavigationListener; -import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; +import com.owncloud.android.R; import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.LocalFileListFragment; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; +import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; -import com.owncloud.android.R; /** * Displays local files and let the user choose what of them wants to upload @@ -54,7 +53,7 @@ import com.owncloud.android.R; * */ -public class UploadFilesActivity extends SherlockFragmentActivity implements +public class UploadFilesActivity extends FileActivity implements LocalFileListFragment.ContainerActivity, OnNavigationListener, OnClickListener, ConfirmationDialogFragmentListener { private ArrayAdapter mDirectories; @@ -62,10 +61,9 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements private LocalFileListFragment mFileListFragment; private Button mCancelBtn; private Button mUploadBtn; - private Account mAccount; + private Account mAccountOnCreation; private DialogFragment mCurrentDialog; - public static final String EXTRA_ACCOUNT = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_ACCOUNT"; public static final String EXTRA_CHOSEN_FILES = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CHOSEN_FILES"; public static final int RESULT_OK_AND_MOVE = RESULT_FIRST_USER; @@ -78,7 +76,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements @Override public void onCreate(Bundle savedInstanceState) { - Log.d(TAG, "onCreate() start"); + Log_OC.d(TAG, "onCreate() start"); super.onCreate(savedInstanceState); if(savedInstanceState != null) { @@ -87,7 +85,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements mCurrentDir = Environment.getExternalStorageDirectory(); } - mAccount = getIntent().getParcelableExtra(EXTRA_ACCOUNT); + mAccountOnCreation = getAccount(); /// USER INTERFACE @@ -110,9 +108,11 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements mCancelBtn.setOnClickListener(this); mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload); mUploadBtn.setOnClickListener(this); + // Action bar setup ActionBar actionBar = getSupportActionBar(); + actionBar.setIcon(DisplayUtils.getSeasonalIconId()); actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getName() != null); actionBar.setDisplayShowTitleEnabled(false); @@ -125,7 +125,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements mCurrentDialog = null; } - Log.d(TAG, "onCreate() end"); + Log_OC.d(TAG, "onCreate() end"); } @@ -181,10 +181,10 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements @Override protected void onSaveInstanceState(Bundle outState) { // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved - Log.d(TAG, "onSaveInstanceState() start"); + Log_OC.d(TAG, "onSaveInstanceState() start"); super.onSaveInstanceState(outState); outState.putString(UploadFilesActivity.KEY_DIRECTORY_PATH, mCurrentDir.getAbsolutePath()); - Log.d(TAG, "onSaveInstanceState() end"); + Log_OC.d(TAG, "onSaveInstanceState() end"); } @@ -319,7 +319,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements File localFile = new File(localPath); total += localFile.length(); } - return (FileStorageUtils.getUsableSpace(mAccount.name) >= total); + return (FileStorageUtils.getUsableSpace(mAccountOnCreation.name) >= total); } /** @@ -347,15 +347,14 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements String[] args = {getString(R.string.app_name)}; ConfirmationDialogFragment dialog = ConfirmationDialogFragment.newInstance(R.string.upload_query_move_foreign_files, args, R.string.common_yes, -1, R.string.common_no); dialog.setOnConfirmationListener(UploadFilesActivity.this); - mCurrentDialog = dialog; - mCurrentDialog.show(getSupportFragmentManager(), QUERY_TO_MOVE_DIALOG_TAG); + dialog.show(getSupportFragmentManager(), QUERY_TO_MOVE_DIALOG_TAG); } } } @Override public void onConfirmation(String callerTag) { - Log.d(TAG, "Positive button in dialog was clicked; dialog tag is " + callerTag); + Log_OC.d(TAG, "Positive button in dialog was clicked; dialog tag is " + callerTag); if (callerTag.equals(QUERY_TO_MOVE_DIALOG_TAG)) { // return the list of selected files to the caller activity (success), signaling that they should be moved to the ownCloud folder, instead of copied Intent data = new Intent(); @@ -363,25 +362,35 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements setResult(RESULT_OK_AND_MOVE, data); finish(); } - mCurrentDialog.dismiss(); - mCurrentDialog = null; } @Override public void onNeutral(String callerTag) { - Log.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag); - mCurrentDialog.dismiss(); - mCurrentDialog = null; + Log_OC.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag); } @Override public void onCancel(String callerTag) { /// nothing to do; don't finish, let the user change the selection - Log.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag); - mCurrentDialog.dismiss(); - mCurrentDialog = null; + Log_OC.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag); + } + + + @Override + protected void onAccountSet(boolean stateWasRecovered) { + if (getAccount() != null) { + if (!mAccountOnCreation.equals(getAccount())) { + setResult(RESULT_CANCELED); + finish(); + } + + } else { + Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!"); + setResult(RESULT_CANCELED); + finish(); + } }