X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/24a1111aa117f9d825646c23909e39a0d12f43b8..231533c56e8873c6c77f6ff9f649c7b587ab5cce:/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 dc564d6f..c2a80900 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -18,7 +18,10 @@ 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; @@ -34,10 +37,14 @@ 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; +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; @@ -55,6 +62,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; @@ -82,24 +90,48 @@ 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"; 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; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - setProgressBarIndeterminateVisibility(false); - + // TODO: fix hack: workaround for bug in actionbar sherlock + // it always shows indeterminate progress bar + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) { + requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); + setProgressBarIndeterminateVisibility(false); + } + + Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext())); + if(savedInstanceState != null){ mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR); } + + 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 @@ -134,9 +166,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements ACTION_SELECT_FILE); break; } - case R.id.action_accounts: { - Intent accountIntent = new Intent(this, AccountSelectActivity.class); - startActivity(accountIntent); + 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){ @@ -191,7 +228,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); @@ -219,6 +255,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { + Log.e("ASD", "restore"); super.onRestoreInstanceState(savedInstanceState); mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY); mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); @@ -226,10 +263,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if (mDirs != null) for (String s : mDirs) mDirectories.insert(s, 0); + mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE); } @Override protected void onSaveInstanceState(Bundle outState) { + Log.e("ASD", "save " + (mCurrentDir != null ? mCurrentDir.getFileName() : "NULL")); super.onSaveInstanceState(outState); if(mDirectories != null && mDirectories.getCount() != 0){ mDirs = new String[mDirectories.getCount()-1]; @@ -238,89 +277,85 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } } outState.putStringArray(KEY_DIR_ARRAY, mDirs); - outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir); + outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir); } @Override protected void onResume() { 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 (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); - // 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); - // Clear intent extra, so rotating the screen will not return us to this directory - getIntent().removeExtra(FileDetailFragment.EXTRA_FILE); - } + // 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); + } 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); - 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); + } } @Override @@ -330,12 +365,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements unregisterReceiver(syncBroadcastRevceiver); syncBroadcastRevceiver = null; } - + getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir); } @Override protected Dialog onCreateDialog(int id) { - Dialog dialog; + Dialog dialog = null; AlertDialog.Builder builder; switch (id) { case DIALOG_SETUP_ACCOUNT: @@ -347,6 +382,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()); @@ -355,7 +406,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) { @@ -366,12 +416,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 @@ -561,4 +610,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } } + public DataStorageManager getStorageManager() { + return mStorageManager; + } }