X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/49eda7d30fcacc017209667f6bf4569f41f4ed42..17e1b2350ce8a2d49dbf66f1d2281dfb04c49cc4:/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..26953214 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -19,10 +19,8 @@
 package eu.alefzero.owncloud.ui.activity;
 
 import java.io.File;
-import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -44,6 +42,7 @@ 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;
 
@@ -75,7 +74,7 @@ import eu.alefzero.webdav.WebdavClient;
  */
 
 public class FileDisplayActivity extends SherlockFragmentActivity implements
-        OnNavigationListener, OnClickListener {
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener {
     private ArrayAdapter<String> mDirectories;
     private DataStorageManager mStorageManager;
     private FileListFragment mFileList;
@@ -95,26 +94,22 @@ 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);
         
         if(savedInstanceState != null){
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);
         }
-        
-        setContentView(R.layout.files);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getSherlock().getMenuInflater();
-        inflater.inflate(R.menu.menu, menu);
-        return true;
+        if (accountsAreSetup()) {
+            MenuInflater inflater = getSherlock().getMenuInflater();
+            inflater.inflate(R.menu.menu, menu);
+            return true;
+        }
+        return false;
     }
 
     @Override
@@ -142,11 +137,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 android.R.id.home: {
-                Intent i = new Intent(this, AccountSelectActivity.class);
-                startActivity(i);
-                finish();
+                if(mCurrentDir != null && mCurrentDir.getParentId() != 0){
+                    onBackPressed(); 
+                }
                 break;
             }
             default:
@@ -208,21 +206,23 @@ 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<String>(this, R.layout.sherlock_spinner_dropdown_item);
         mDirectories.add("/");
@@ -234,7 +234,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @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);
@@ -250,8 +250,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         
         //TODO: Dialog useless -> get rid of this
         if (!accountsAreSetup()) {
-            showDialog(DIALOG_SETUP_ACCOUNT);
+            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
@@ -274,6 +279,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             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);
         } 
                 
         // Drop-Down navigation and file list restore
@@ -308,7 +316,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         action_bar.setDisplayShowTitleEnabled(false);
         action_bar.setListNavigationCallbacks(mDirectories, this);
-        action_bar.setDisplayHomeAsUpEnabled(true);
+        if(mCurrentDir != null && mCurrentDir.getParentId() != 0){
+            action_bar.setDisplayHomeAsUpEnabled(true);
+        } else {
+            action_bar.setDisplayHomeAsUpEnabled(false);
+        }
         
         // List dir here
         mFileList.listDirectory(mCurrentDir);
@@ -543,4 +555,13 @@ 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);
+        }
+    }
+
 }