X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/49eda7d30fcacc017209667f6bf4569f41f4ed42..fbaca889e2acbdf06c970e74be6fd16a4059de37:/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 3310ff46..fae2b0fd 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -18,11 +18,12 @@ package eu.alefzero.owncloud.ui.activity; +import java.io.BufferedReader; import java.io.File; -import java.net.URLDecoder; +import java.io.InputStreamReader; +import java.lang.Thread.UncaughtExceptionHandler; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.Arrays; import android.accounts.Account; import android.accounts.AccountManager; @@ -40,10 +41,12 @@ 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; @@ -56,6 +59,7 @@ import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.Window; import eu.alefzero.owncloud.AccountUtils; +import eu.alefzero.owncloud.CrashHandler; import eu.alefzero.owncloud.R; import eu.alefzero.owncloud.authenticator.AccountAuthenticator; import eu.alefzero.owncloud.datamodel.DataStorageManager; @@ -75,7 +79,7 @@ import eu.alefzero.webdav.WebdavClient; */ public class FileDisplayActivity extends SherlockFragmentActivity implements - OnNavigationListener, OnClickListener { + OnNavigationListener, OnClickListener, android.view.View.OnClickListener { private ArrayAdapter mDirectories; private DataStorageManager mStorageManager; private FileListFragment mFileList; @@ -83,7 +87,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements private String[] mDirs = null; private SyncBroadcastReceiver syncBroadcastRevceiver; - + + private View mLayoutView = null; + private static final String KEY_DIR_ARRAY = "DIR_ARRAY"; private static final String KEY_CURRENT_DIR = "DIR"; @@ -95,26 +101,36 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - return; - } - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); setProgressBarIndeterminateVisibility(false); - + + Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext())); + if(savedInstanceState != null){ mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR); } - setContentView(R.layout.files); + if (findViewById(R.id.file_list_view) == null) + mLayoutView = getLayoutInflater().inflate(R.layout.files, null); // always inflate this at onCreate() ; just once! + + //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); + + } else if (findViewById(R.id.file_list_view) == null) { + setContentView(mLayoutView); + } + } @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getSherlock().getMenuInflater(); - inflater.inflate(R.menu.menu, menu); - return true; + inflater.inflate(R.menu.menu, menu); + return true; } @Override @@ -142,11 +158,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements ACTION_SELECT_FILE); break; } - + case R.id.action_settings: { + Intent settingsIntent = new Intent(this, Preferences.class); + startActivity(settingsIntent); + } case android.R.id.home: { - Intent i = new Intent(this, AccountSelectActivity.class); - startActivity(i); - finish(); + if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ + onBackPressed(); + } break; } default: @@ -196,7 +215,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if (!remotepath.endsWith("/")) remotepath += "/"; remotepath += URLEncoder.encode(new File(filepath).getName()); - Log.e("ASD", remotepath + ""); i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath); i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath); @@ -208,33 +226,36 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override public void onBackPressed() { - if (mDirectories.getCount() == 1) { + if (mDirectories == null || mDirectories.getCount() <= 1) { finish(); return; } popDirname(); mFileList.onNavigateUp(); + mCurrentDir = mFileList.getCurrentFile(); + + if(mCurrentDir.getParentId() == 0){ + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayHomeAsUpEnabled(false); + } } @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); - // Check, if there are ownCloud accounts - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - } mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY); mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); mDirectories.add("/"); if (mDirs != null) for (String s : mDirs) mDirectories.insert(s, 0); + mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR); } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - if(mDirectories != null){ + if(mDirectories != null && mDirectories.getCount() != 0){ mDirs = new String[mDirectories.getCount()-1]; for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) { mDirs[i] = mDirectories.getItem(j); @@ -248,70 +269,78 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements protected void onResume() { super.onResume(); - //TODO: Dialog useless -> get rid of this - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - return; - } + if (accountsAreSetup()) { + + setContentView(mLayoutView); // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27) - // Listen for sync messages - IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE); - syncBroadcastRevceiver = new SyncBroadcastReceiver(); - registerReceiver(syncBroadcastRevceiver, syncIntentFilter); + // 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()); + // Storage manager initialization + mStorageManager = new FileDataStorageManager( + AccountUtils.getCurrentOwnCloudAccount(this), + getContentResolver()); - // File list - mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + // 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.isDirectory()){ - mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId()); + // 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()); + } + + // Clear intent extra, so rotating the screen will not return us to this directory + getIntent().removeExtra(FileDetailFragment.EXTRA_FILE); + } else { + 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); - action_bar.setDisplayHomeAsUpEnabled(true); + // 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); + } } @Override @@ -321,7 +350,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements unregisterReceiver(syncBroadcastRevceiver); syncBroadcastRevceiver = null; } - } @Override @@ -346,7 +374,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements builder.setTitle(R.string.uploader_info_dirname); int typed_color = getResources().getColor(R.color.setup_text_typed); dirNameInput.setTextColor(typed_color); - builder.setPositiveButton(android.R.string.ok, new OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -357,12 +384,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } // Figure out the path where the dir needs to be created - String path = mCurrentDir.getRemotePath(); + String path = FileDisplayActivity.this.mCurrentDir.getRemotePath(); // Create directory path += directoryName + "/"; - Thread thread = new Thread(new DirectoryCreator( - path, a)); + Thread thread = new Thread(new DirectoryCreator(path, a)); thread.start(); // Save new directory in local database @@ -487,7 +513,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements String password = mAm.getPassword(mAccount); wdc.setCredentials(username, password); - wdc.allowUnsignedCertificates(); + wdc.allowSelfsignedCertificates(); wdc.createDirectory(mTargetPath); } @@ -543,4 +569,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } + @Override + public void onClick(View v) { + if (v.getId() == R.id.setup_account) { + Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); + intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); + startActivity(intent); + } + } + + public DataStorageManager getStorageManager() { + return mStorageManager; + } }