account selecton on start, moving api to 8, display info about emtpy dir

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 60e9a7c..ae35b64 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />\r
 \r
     <uses-sdk\r
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />\r
 \r
     <uses-sdk\r

-        android:minSdkVersion="7"\r
+        android:minSdkVersion="8"\r

         android:targetSdkVersion="13" />\r
 \r
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >\r
         android:targetSdkVersion="13" />\r
 \r
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >\r

diff --git a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
index 423ce56..7ecb491 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
+++ b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
@@ -164,7 +164,7 @@ public class FileDataStorageManager implements DataStorageManager {
   }
 
   public Vector<OCFile> getDirectoryContent(OCFile f) {
   }
 
   public Vector<OCFile> getDirectoryContent(OCFile f) {

-    if (f.isDirectory() && f.getFileId() != -1) {
+    if (f != null && f.isDirectory() && f.getFileId() != -1) {

       Vector<OCFile> ret = new Vector<OCFile>();
 
       Uri req_uri = Uri.withAppendedPath(
       Vector<OCFile> ret = new Vector<OCFile>();
 
       Uri req_uri = Uri.withAppendedPath(

diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index f1d45b4..9b76810 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -60,7 +60,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
     public static final String PARAM_HOSTNAME = "param_Hostname";\r
 \r
     public AuthenticatorActivity() {\r
     public static final String PARAM_HOSTNAME = "param_Hostname";\r
 \r
     public AuthenticatorActivity() {\r

-      mUseSSLConnection = false;\r
+      mUseSSLConnection = true;\r

     }\r
     \r
     @Override\r
     }\r
     \r
     @Override\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index a543777..3522ea0 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -59,11 +59,12 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r

-               OnNavigationListener {\r
+               OnNavigationListener, OnClickListener {\r

        private ArrayAdapter<String> mDirectories;\r
        private DataStorageManager mStorageManager;\r
 \r
        private ArrayAdapter<String> mDirectories;\r
        private DataStorageManager mStorageManager;\r
 \r

-       private static final int DIALOG_CHOOSE_ACCOUNT = 0;\r
+       private static final int DIALOG_SETUP_ACCOUNT = 0;\r
+       private static final int DIALOG_CREATE_DIR = 1;\r

 \r
        public void pushPath(String path) {\r
                mDirectories.insert(path, 0);\r
 \r
        public void pushPath(String path) {\r
                mDirectories.insert(path, 0);\r


@@ -75,51 +76,75 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        }\r
 \r
        @Override\r
        }\r
 \r
        @Override\r

-       protected Dialog onCreateDialog(int id, Bundle args) {\r
-               final AlertDialog.Builder builder = new Builder(this);\r
-               final EditText dirName = new EditText(getBaseContext());\r
-               final Account a = AuthUtils.getCurrentOwnCloudAccount(this);\r
-               builder.setView(dirName);\r
-               builder.setTitle(R.string.uploader_info_dirname);\r
-               dirName.setTextColor(R.color.setup_text_typed);\r
-\r
-               builder.setPositiveButton(R.string.common_ok, new OnClickListener() {\r
-                       public void onClick(DialogInterface dialog, int which) {\r
-                               String s = dirName.getText().toString();\r
-                               if (s.trim().isEmpty()) {\r
-                                       dialog.cancel();\r
-                                       return;\r
-                               }\r
-\r
-                               String path = "";\r
-                               for (int i = mDirectories.getCount() - 2; i >= 0; --i) {\r
-                                       path += "/" + mDirectories.getItem(i);\r
-                               }\r
-                               OCFile parent = mStorageManager.getFileByPath(path + "/");\r
-                               path += s + "/";\r
-                               Thread thread = new Thread(new DirectoryCreator(path, a));\r
-                               thread.start();\r
-                               \r
-                               OCFile new_file = new OCFile(path);\r
-                               new_file.setMimetype("DIR");\r
-                               new_file.setParentId(parent.getParentId());\r
-                               mStorageManager.saveFile(new_file);\r
-\r
-                               dialog.dismiss();\r
-                       }\r
-               });\r
-               builder.setNegativeButton(R.string.common_cancel,\r
-                               new OnClickListener() {\r
-                                       public void onClick(DialogInterface dialog, int which) {\r
-                                               dialog.cancel();\r
-                                       }\r
-                               });\r
-               return builder.create();\r
-       }\r
+  protected Dialog onCreateDialog(int id) {\r
+    Dialog dialog;\r
+    AlertDialog.Builder builder;\r
+    switch(id){\r
+    case DIALOG_SETUP_ACCOUNT:\r
+      builder = new AlertDialog.Builder(this);\r
+      builder.setTitle(R.string.main_tit_accsetup);\r
+      builder.setMessage(R.string.main_wrn_accsetup);\r
+      builder.setCancelable(false);\r
+      builder.setPositiveButton(R.string.common_ok, this);\r
+      builder.setNegativeButton(R.string.common_cancel, this);\r
+      dialog = builder.create();\r
+      break;\r
+    case DIALOG_CREATE_DIR:\r
+    {\r
+      builder = new Builder(this);\r
+      final EditText dirName = new EditText(getBaseContext());\r
+      final Account a = AuthUtils.getCurrentOwnCloudAccount(this);\r
+      builder.setView(dirName);\r
+      builder.setTitle(R.string.uploader_info_dirname);\r
+      dirName.setTextColor(R.color.setup_text_typed);\r
+\r
+      builder.setPositiveButton(R.string.common_ok, new OnClickListener() {\r
+        public void onClick(DialogInterface dialog, int which) {\r
+          String s = dirName.getText().toString();\r
+          if (s.trim().isEmpty()) {\r
+            dialog.cancel();\r
+            return;\r
+          }\r
+\r
+          String path = "";\r
+          for (int i = mDirectories.getCount() - 2; i >= 0; --i) {\r
+            path += "/" + mDirectories.getItem(i);\r
+          }\r
+          OCFile parent = mStorageManager.getFileByPath(path + "/");\r
+          path += s + "/";\r
+          Thread thread = new Thread(new DirectoryCreator(path, a));\r
+          thread.start();\r
+          \r
+          OCFile new_file = new OCFile(path);\r
+          new_file.setMimetype("DIR");\r
+          new_file.setParentId(parent.getParentId());\r
+          mStorageManager.saveFile(new_file);\r
+\r
+          dialog.dismiss();\r
+        }\r
+      });\r
+      builder.setNegativeButton(R.string.common_cancel,\r
+          new OnClickListener() {\r
+            public void onClick(DialogInterface dialog, int which) {\r
+              dialog.cancel();\r
+            }\r
+          });\r
+    }\r
+    default: \r
+      dialog = null;\r
+    }\r
+      \r
+    return dialog;\r
+  }\r

 \r
        @Override\r
        public void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
 \r
        @Override\r
        public void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r

+               if(!accountsAreSetup()){\r
+      showDialog(DIALOG_SETUP_ACCOUNT);\r
+      return;\r
+    }\r
+\r

                mDirectories = new CustomArrayAdapter<String>(this,\r
                                R.layout.sherlock_spinner_dropdown_item);\r
                mDirectories.add("/");\r
                mDirectories = new CustomArrayAdapter<String>(this,\r
                                R.layout.sherlock_spinner_dropdown_item);\r
                mDirectories.add("/");\r


@@ -141,7 +166,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                        break;\r
                }\r
                case R.id.createDirectoryItem: {\r
                        break;\r
                }\r
                case R.id.createDirectoryItem: {\r

-                       showDialog(0);\r
+                       showDialog(DIALOG_CREATE_DIR);\r

                        break;\r
                }\r
                case android.R.id.home: {\r
                        break;\r
                }\r
                case android.R.id.home: {\r


@@ -165,51 +190,38 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        }\r
 \r
        @Override\r
        }\r
 \r
        @Override\r

-       protected Dialog onCreateDialog(int id) {\r
-               switch (id) {\r
-               case DIALOG_CHOOSE_ACCOUNT:\r
-                       return createChooseAccountDialog();\r
-               default:\r
-                       throw new IllegalArgumentException("Unknown dialog id: " + id);\r
-               }\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
        }\r
 \r
        public boolean onCreateOptionsMenu(Menu menu) {\r
                MenuInflater inflater = getSherlock().getMenuInflater();\r
                inflater.inflate(R.menu.menu, menu);\r
                return true;\r
        }\r
 \r

-       private Dialog createChooseAccountDialog() {\r
-               final AccountManager accMan = AccountManager.get(this);\r
-               CharSequence[] items = new CharSequence[accMan\r
-                               .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];\r
-               int i = 0;\r
-               for (Account a : accMan\r
-                               .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)) {\r
-                       items[i++] = a.name;\r
-               }\r
-\r
-               AlertDialog.Builder builder = new AlertDialog.Builder(this);\r
-               builder.setTitle(R.string.common_choose_account);\r
-               builder.setCancelable(true);\r
-               builder.setItems(items, new DialogInterface.OnClickListener() {\r
-                       public void onClick(DialogInterface dialog, int item) {\r
-                               // mAccount =\r
-                               // accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];\r
-                               dialog.dismiss();\r
-                       }\r
-               });\r
-               builder.setOnCancelListener(new OnCancelListener() {\r
-                       public void onCancel(DialogInterface dialog) {\r
-                               FileDisplayActivity.this.finish();\r
-                       }\r
-               });\r
-               AlertDialog alert = builder.create();\r
-               return alert;\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
+         }\r
+        \r
+        @Override\r
+         protected void onStart() {\r
+           super.onStart();\r
+           // Check, if there are ownCloud accounts\r
+           if(!accountsAreSetup()){\r
+             showDialog(DIALOG_SETUP_ACCOUNT);\r
+           }\r
+        }\r
+           \r
+        @Override\r
+       protected void onResume() {\r
+         super.onResume();\r
+         if(!accountsAreSetup()){\r
+      showDialog(DIALOG_SETUP_ACCOUNT);\r
+    }\r

        }\r
        }\r

-\r
+           \r

        @Override\r
        public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
                int i = itemPosition;\r
        @Override\r
        public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
                int i = itemPosition;\r


@@ -278,4 +290,35 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
                \r
        }\r
 \r
                \r
        }\r

+\r
+        public void onClick(DialogInterface dialog, int which) {\r
+           // In any case - we won't need it anymore\r
+           dialog.dismiss();\r
+           switch(which){\r
+           case DialogInterface.BUTTON_POSITIVE:\r
+             Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
+             intent.putExtra("authorities",\r
+                 new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+             startActivity(intent);\r
+             break;\r
+           case DialogInterface.BUTTON_NEGATIVE:\r
+             finish();\r
+           }\r
+           \r
+         }\r
+       \r
+       /**\r
+   * Checks, whether or not there are any ownCloud accounts \r
+   * setup. \r
+   *  \r
+   * @return true, if there is at least one account.\r
+   */\r
+  private boolean accountsAreSetup() {\r
+    AccountManager accMan = AccountManager.get(this);\r
+    Account[] accounts = accMan\r
+        .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE); \r
+    return accounts.length > 0;\r
+  }\r
+  \r
+  \r

 }
 }

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
index 452eca0..1fb0c57 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
@@ -26,6 +26,7 @@ import android.os.Bundle;
 import android.util.Log;\r
 import android.view.View;\r
 import android.widget.AdapterView;\r
 import android.util.Log;\r
 import android.view.View;\r
 import android.widget.AdapterView;\r

+import android.widget.Toast;\r

 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AuthUtils;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AuthUtils;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r


@@ -109,6 +110,9 @@ public class FileListFragment extends FragmentListView {
     mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
     OCFile file = mStorageManager.getFileByPath(s);\r
     mFiles = mStorageManager.getDirectoryContent(file);\r
     mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
     OCFile file = mStorageManager.getFileByPath(s);\r
     mFiles = mStorageManager.getDirectoryContent(file);\r

+    if (mFiles == null || mFiles.size() == 0) {\r
+      Toast.makeText(getActivity(), "There are no files here", Toast.LENGTH_LONG).show();\r
+    }\r

     setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity()));\r
   }\r
   \r
     setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity()));\r
   }\r
   \r