X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fc59d2c4f66846a9d049db645633ab9788c72b46..a50d17dcb60db5c2db5cb9e9e6ed1af64dca404b:/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 188537e0..07ca6f53 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -18,11 +18,7 @@ package eu.alefzero.owncloud.ui.activity; -import java.io.BufferedReader; import java.io.File; -import java.io.InputStreamReader; -import java.lang.Thread.UncaughtExceptionHandler; -import java.net.URLEncoder; import java.util.ArrayList; import android.accounts.Account; @@ -37,18 +33,19 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager.NameNotFoundException; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; -import android.telephony.TelephonyManager; import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.CheckedTextView; import android.widget.EditText; import android.widget.TextView; +import android.widget.Toast; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar.OnNavigationListener; @@ -65,6 +62,7 @@ import eu.alefzero.owncloud.authenticator.AccountAuthenticator; import eu.alefzero.owncloud.datamodel.DataStorageManager; import eu.alefzero.owncloud.datamodel.FileDataStorageManager; import eu.alefzero.owncloud.datamodel.OCFile; +import eu.alefzero.owncloud.files.services.FileDownloader; import eu.alefzero.owncloud.files.services.FileUploader; import eu.alefzero.owncloud.syncadapter.FileSyncService; import eu.alefzero.owncloud.ui.fragment.FileDetailFragment; @@ -79,34 +77,56 @@ import eu.alefzero.webdav.WebdavClient; */ public class FileDisplayActivity extends SherlockFragmentActivity implements - OnNavigationListener, OnClickListener, android.view.View.OnClickListener { + OnNavigationListener, OnClickListener, android.view.View.OnClickListener { + private ArrayAdapter mDirectories; - private DataStorageManager mStorageManager; - private FileListFragment mFileList; private OCFile mCurrentDir; private String[] mDirs = null; - private SyncBroadcastReceiver syncBroadcastRevceiver; - + private DataStorageManager mStorageManager; + private SyncBroadcastReceiver mSyncBroadcastReceiver; + private UploadFinishReceiver mUploadFinishReceiver; + + private View mLayoutView = null; + private FileListFragment mFileList; + private static final String KEY_DIR_ARRAY = "DIR_ARRAY"; private static final String KEY_CURRENT_DIR = "DIR"; private static final int DIALOG_SETUP_ACCOUNT = 0; private static final int DIALOG_CREATE_DIR = 1; + private static final int DIALOG_ABOUT_APP = 2; + private static final int ACTION_SELECT_FILE = 1; + //private static final int ACTION_CREATE_FIRST_ACCOUNT = 2; dvelasco: WIP @Override public void onCreate(Bundle savedInstanceState) { + Log.i(getClass().toString(), "onCreate() start"); super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - setProgressBarIndeterminateVisibility(false); + setSupportProgressBarIndeterminateVisibility(false); Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext())); if(savedInstanceState != null){ - mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR); + mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR); // this is never saved with this key :S + } + + mLayoutView = getLayoutInflater().inflate(R.layout.files, null); // always inflate this at onCreate() ; just once! + + if (AccountUtils.accountsAreSetup(this)) { + setContentView(mLayoutView); + + } else { + setContentView(R.layout.no_account_available); + setProgressBarIndeterminateVisibility(false); + getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE); + findViewById(R.id.setup_account).setOnClickListener(this); } + + Log.i(getClass().toString(), "onCreate() end"); } @Override @@ -144,6 +164,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements case R.id.action_settings: { Intent settingsIntent = new Intent(this, Preferences.class); startActivity(settingsIntent); + break; + } + case R.id.about_app : { + showDialog(DIALOG_ABOUT_APP); + break; } case android.R.id.home: { if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ @@ -170,8 +195,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements * Called, when the user selected something for uploading */ public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode == RESULT_OK) { - if (requestCode == ACTION_SELECT_FILE) { + if (requestCode == ACTION_SELECT_FILE) { + if (resultCode == RESULT_OK) { Uri selectedImageUri = data.getData(); String filemanagerstring = selectedImageUri.getPath(); @@ -193,18 +218,25 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements AccountUtils.getCurrentOwnCloudAccount(this)); String remotepath = new String(); for (int j = mDirectories.getCount() - 2; j >= 0; --j) { - remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j)); + remotepath += "/" + mDirectories.getItem(j); } if (!remotepath.endsWith("/")) remotepath += "/"; - remotepath += URLEncoder.encode(new File(filepath).getName()); + remotepath += new File(filepath).getName(); + remotepath = Uri.encode(remotepath, "/"); i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath); i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath); i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE); startService(i); } - } + + }/* dvelasco: WIP - not working as expected ... yet :) + else if (requestCode == ACTION_CREATE_FIRST_ACCOUNT) { + if (resultCode != RESULT_OK) { + finish(); // the user cancelled the AuthenticatorActivity + } + }*/ } @Override @@ -225,6 +257,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { + Log.i(getClass().toString(), "onRestoreInstanceState() start"); super.onRestoreInstanceState(savedInstanceState); mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY); mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); @@ -232,11 +265,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if (mDirs != null) for (String s : mDirs) mDirectories.insert(s, 0); - mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR); + mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE); + Log.i(getClass().toString(), "onRestoreInstanceState() end"); } @Override protected void onSaveInstanceState(Bundle outState) { + Log.i(getClass().toString(), "onSaveInstanceState() start"); super.onSaveInstanceState(outState); if(mDirectories != null && mDirectories.getCount() != 0){ mDirs = new String[mDirectories.getCount()-1]; @@ -245,105 +280,123 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } } outState.putStringArray(KEY_DIR_ARRAY, mDirs); - outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir); + outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir); + Log.i(getClass().toString(), "onSaveInstanceState() end"); } @Override protected void onResume() { + Log.i(getClass().toString(), "onResume() start"); super.onResume(); - - //TODO: Dialog useless -> get rid of this - if (!accountsAreSetup()) { - setContentView(R.layout.no_account_available); - setProgressBarIndeterminateVisibility(false); - getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE); - findViewById(R.id.setup_account).setOnClickListener(this); - return; - } else if (findViewById(R.id.file_list_view) == null) { - setContentView(R.layout.files); - } - // Listen for sync messages - IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE); - syncBroadcastRevceiver = new SyncBroadcastReceiver(); - registerReceiver(syncBroadcastRevceiver, syncIntentFilter); - - // Storage manager initialization - mStorageManager = new FileDataStorageManager( - AccountUtils.getCurrentOwnCloudAccount(this), - getContentResolver()); + if (!AccountUtils.accountsAreSetup(this)) { + /*Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT); + intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); + //startActivity(intent); + startActivityForResult(intent, ACTION_CREATE_FIRST_ACCOUNT);*/ + + } else { // at least an account exist: normal operation + + // set the layout only if it couldn't be set in onCreate + if (findViewById(R.id.file_list_view) == null) + setContentView(mLayoutView); + + // Listen for sync messages + IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE); + mSyncBroadcastReceiver = new SyncBroadcastReceiver(); + registerReceiver(mSyncBroadcastReceiver, syncIntentFilter); + + // Listen for upload messages + IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE); + mUploadFinishReceiver = new UploadFinishReceiver(); + registerReceiver(mUploadFinishReceiver, uploadIntentFilter); - // File list - mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + // Storage manager initialization + mStorageManager = new FileDataStorageManager( + AccountUtils.getCurrentOwnCloudAccount(this), + getContentResolver()); - // Figure out what directory to list. - // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null) - if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){ - mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); - if(!mCurrentDir.isDirectory()){ - mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId()); + // File list + mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + + // Figure out what directory to list. + // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null) + if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){ + mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); + if(mCurrentDir != null && !mCurrentDir.isDirectory()){ + mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId()); + } + + // Clear intent extra, so rotating the screen will not return us to this directory + getIntent().removeExtra(FileDetailFragment.EXTRA_FILE); } - // Clear intent extra, so rotating the screen will not return us to this directory - getIntent().removeExtra(FileDetailFragment.EXTRA_FILE); - } else { - mCurrentDir = mStorageManager.getFileByPath("/"); - } + if (mCurrentDir == null) + mCurrentDir = mStorageManager.getFileByPath("/"); - // Drop-Down navigation and file list restore - mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); + // Drop-Down navigation and file list restore + mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); - // Given the case we have a file to display: - if(mCurrentDir != null){ - ArrayList files = new ArrayList(); - OCFile currFile = mCurrentDir; - while(currFile != null){ - files.add(currFile); - currFile = mStorageManager.getFileById(currFile.getParentId()); - } + // Given the case we have a file to display: + if(mCurrentDir != null){ + ArrayList files = new ArrayList(); + OCFile currFile = mCurrentDir; + while(currFile != null){ + files.add(currFile); + currFile = mStorageManager.getFileById(currFile.getParentId()); + } - // Insert in mDirs - mDirs = new String[files.size()]; - for(int i = files.size() - 1; i >= 0; i--){ - mDirs[i] = files.get(i).getFileName(); + // Insert in mDirs + mDirs = new String[files.size()]; + for(int i = files.size() - 1; i >= 0; i--){ + mDirs[i] = files.get(i).getFileName(); + } } - } - if (mDirs != null) { - for (String s : mDirs) - mDirectories.add(s); - } else { - mDirectories.add("/"); - } + if (mDirs != null) { + for (String s : mDirs) + mDirectories.add(s); + } else { + mDirectories.add("/"); + } - // Actionbar setup - ActionBar action_bar = getSupportActionBar(); - action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); - action_bar.setDisplayShowTitleEnabled(false); - action_bar.setListNavigationCallbacks(mDirectories, this); - if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ - action_bar.setDisplayHomeAsUpEnabled(true); - } else { - action_bar.setDisplayHomeAsUpEnabled(false); - } + // Actionbar setup + ActionBar action_bar = getSupportActionBar(); + action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); + action_bar.setDisplayShowTitleEnabled(false); + action_bar.setListNavigationCallbacks(mDirectories, this); + if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ + action_bar.setDisplayHomeAsUpEnabled(true); + } else { + action_bar.setDisplayHomeAsUpEnabled(false); + } - // List dir here - mFileList.listDirectory(mCurrentDir); + // List dir here + mFileList.listDirectory(mCurrentDir); + } + Log.i(getClass().toString(), "onResume() end"); } @Override protected void onPause() { + Log.i(getClass().toString(), "onPause() start"); super.onPause(); - if (syncBroadcastRevceiver != null) { - unregisterReceiver(syncBroadcastRevceiver); - syncBroadcastRevceiver = null; + if (mSyncBroadcastReceiver != null) { + unregisterReceiver(mSyncBroadcastReceiver); + mSyncBroadcastReceiver = null; + } + if (mUploadFinishReceiver != null) { + unregisterReceiver(mUploadFinishReceiver); + mUploadFinishReceiver = null; } + getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir); + Log.i(getClass().toString(), "onPause() end"); } @Override protected Dialog onCreateDialog(int id) { - Dialog dialog; + Dialog dialog = null; AlertDialog.Builder builder; switch (id) { case DIALOG_SETUP_ACCOUNT: @@ -355,6 +408,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements builder.setNegativeButton(android.R.string.cancel, this); dialog = builder.create(); break; + case DIALOG_ABOUT_APP: { + builder = new AlertDialog.Builder(this); + builder.setTitle("About"); + PackageInfo pkg; + try { + pkg = getPackageManager().getPackageInfo(getPackageName(), 0); + builder.setMessage("ownCloud android client\n\nversion: " + pkg.versionName ); + builder.setIcon(android.R.drawable.ic_menu_info_details); + dialog = builder.create(); + } catch (NameNotFoundException e) { + builder = null; + dialog = null; + e.printStackTrace(); + } + break; + } case DIALOG_CREATE_DIR: { builder = new Builder(this); final EditText dirNameInput = new EditText(getBaseContext()); @@ -373,10 +442,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } // Figure out the path where the dir needs to be created - String path = FileDisplayActivity.this.mCurrentDir.getRemotePath(); + String path; + if (mCurrentDir == null) { + // this is just a patch; we should ensure that mCurrentDir never is null + if (!mStorageManager.fileExists("/")) { + OCFile file = new OCFile("/"); + mStorageManager.saveFile(file); + } + mCurrentDir = mStorageManager.getFileByPath("/"); + } + path = FileDisplayActivity.this.mCurrentDir.getRemotePath(); // Create directory - path += directoryName + "/"; + path += Uri.encode(directoryName) + "/"; Thread thread = new Thread(new DirectoryCreator(path, a)); thread.start(); @@ -469,18 +547,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements return !mDirectories.isEmpty(); } - /** - * Checks, whether or not there are any ownCloud accounts setup. - * - * @return true, if there is at least one account. - */ - private boolean accountsAreSetup() { - AccountManager accMan = AccountManager.get(this); - Account[] accounts = accMan - .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE); - return accounts.length > 0; - } - private class DirectoryCreator implements Runnable { private String mTargetPath; private Account mAccount; @@ -494,8 +560,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override public void run() { - WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData( - mAccount, AccountAuthenticator.KEY_OC_URL))); + WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext()); String username = mAccount.name.substring(0, mAccount.name.lastIndexOf('@')); @@ -547,17 +612,58 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements .getStringExtra(FileSyncService.ACCOUNT_NAME); Log.d("FileDisplay", "sync of account " + account_name + " is in_progress: " + inProgress); - setProgressBarIndeterminateVisibility(inProgress); + setSupportProgressBarIndeterminateVisibility(inProgress); + + long OCDirId = intent.getLongExtra(FileSyncService.SYNC_FOLDER, -1); + if (OCDirId > 0) { + OCFile syncDir = mStorageManager.getFileById(OCDirId); + if (syncDir != null && ( + (mCurrentDir == null && syncDir.getFileName().equals("/")) || + syncDir.equals(mCurrentDir)) + ) { + FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + if (fileListFragment != null) { + fileListFragment.listDirectory(); + } + } + } + if (!inProgress) { - FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager() + FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager() .findFragmentById(R.id.fileList); - if (fileListFramgent != null) - fileListFramgent.listDirectory(); + if (fileListFragment != null) + fileListFragment.listDirectory(); } } } + + + private class UploadFinishReceiver extends BroadcastReceiver { + /** + * Once the file upload has finished -> update view + * @author David A. Velasco + * {@link BroadcastReceiver} to enable upload feedback in UI + */ + @Override + public void onReceive(Context context, Intent intent) { + long parentDirId = intent.getLongExtra(FileUploader.EXTRA_PARENT_DIR_ID, -1); + OCFile parentDir = mStorageManager.getFileById(parentDirId); + + if (parentDir != null && ( + (mCurrentDir == null && parentDir.getFileName().equals("/")) || + parentDir.equals(mCurrentDir)) + ) { + FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + if (fileListFragment != null) { + fileListFragment.listDirectory(); + } + } + } + + } + @Override public void onClick(View v) { if (v.getId() == R.id.setup_account) { @@ -565,5 +671,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); startActivity(intent); } + } + + public DataStorageManager getStorageManager() { + return mStorageManager; } }