hide menu in non account vie

[pub/Android/ownCloud.git] / 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 47dae5f..2695321 100644 (file)
--- 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;\r
 \r
 import java.io.File;\r
-import java.net.URLDecoder;\r
 import java.net.URLEncoder;\r
 import java.util.ArrayList;\r
-import java.util.Arrays;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
@@ -44,6 +42,7 @@ import android.util.Log;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.ArrayAdapter;\r
+import android.widget.CheckedTextView;\r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 \r
@@ -75,7 +74,7 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
-        OnNavigationListener, OnClickListener {\r
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r
     private ArrayAdapter<String> mDirectories;\r
     private DataStorageManager mStorageManager;\r
     private FileListFragment mFileList;\r
@@ -95,26 +94,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
 \r
-        if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
-            return;\r
-        }\r
-\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
         \r
         if(savedInstanceState != null){\r
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
         }\r
-        \r
-        setContentView(R.layout.files);\r
     }\r
 \r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
-        MenuInflater inflater = getSherlock().getMenuInflater();\r
-        inflater.inflate(R.menu.menu, menu);\r
-        return true;\r
+        if (accountsAreSetup()) {\r
+            MenuInflater inflater = getSherlock().getMenuInflater();\r
+            inflater.inflate(R.menu.menu, menu);\r
+            return true;\r
+        }\r
+        return false;\r
     }\r
 \r
     @Override\r
@@ -142,11 +137,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         ACTION_SELECT_FILE);\r
                 break;\r
             }\r
-    \r
+            case R.id.action_accounts: {\r
+                Intent accountIntent = new Intent(this, AccountSelectActivity.class);\r
+                startActivity(accountIntent);\r
+            }\r
             case android.R.id.home: {\r
-                Intent i = new Intent(this, AccountSelectActivity.class);\r
-                startActivity(i);\r
-                finish();\r
+                if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
+                    onBackPressed(); \r
+                }\r
                 break;\r
             }\r
             default:\r
@@ -208,22 +206,23 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     public void onBackPressed() {\r
-        if (mDirectories.getCount() == 1) {\r
+        if (mDirectories == null || mDirectories.getCount() == 1) {\r
             finish();\r
             return;\r
         }\r
         popDirname();\r
         mFileList.onNavigateUp();\r
         mCurrentDir = mFileList.getCurrentFile();\r
+        \r
+        if(mCurrentDir.getParentId() == 0){\r
+            ActionBar actionBar = getSupportActionBar(); \r
+            actionBar.setDisplayHomeAsUpEnabled(false);\r
+        } \r
     }\r
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
         super.onRestoreInstanceState(savedInstanceState);\r
-        // Check, if there are ownCloud accounts\r
-        if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
-        }\r
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         mDirectories.add("/");\r
@@ -235,7 +234,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
         super.onSaveInstanceState(outState);\r
-        if(mDirectories != null){\r
+        if(mDirectories != null && mDirectories.getCount() != 0){\r
             mDirs = new String[mDirectories.getCount()-1];\r
             for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {\r
                 mDirs[i] = mDirectories.getItem(j);\r
@@ -251,8 +250,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         //TODO: Dialog useless -> get rid of this\r
         if (!accountsAreSetup()) {\r
-            showDialog(DIALOG_SETUP_ACCOUNT);\r
+            setContentView(R.layout.no_account_available);\r
+            setProgressBarIndeterminateVisibility(false);\r
+            getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
+            findViewById(R.id.setup_account).setOnClickListener(this);\r
             return;\r
+        } else if (findViewById(R.id.file_list_view) == null) {\r
+            setContentView(R.layout.files);\r
         }\r
 \r
         // Listen for sync messages\r
@@ -312,7 +316,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
         action_bar.setDisplayShowTitleEnabled(false);\r
         action_bar.setListNavigationCallbacks(mDirectories, this);\r
-        action_bar.setDisplayHomeAsUpEnabled(true);\r
+        if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
+            action_bar.setDisplayHomeAsUpEnabled(true);\r
+        } else {\r
+            action_bar.setDisplayHomeAsUpEnabled(false);\r
+        }\r
         \r
         // List dir here\r
         mFileList.listDirectory(mCurrentDir);\r
@@ -547,4 +555,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     }\r
 \r
+    @Override\r
+    public void onClick(View v) {\r
+        if (v.getId() == R.id.setup_account) {\r
+            Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
+            intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            startActivity(intent);\r
+        }\r
+    }\r
+\r
 }\r