Forgotten version number

[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 9430692..e8f9151 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,11 +18,7 @@
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r

-import java.io.BufferedReader;\r

 import java.io.File;\r
 import java.io.File;\r

-import java.io.InputStreamReader;\r
-import java.lang.Thread.UncaughtExceptionHandler;\r
-import java.net.URLEncoder;\r

 import java.util.ArrayList;\r
 \r
 import android.accounts.Account;\r
 import java.util.ArrayList;\r
 \r
 import android.accounts.Account;\r


@@ -38,18 +34,15 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.pm.PackageInfo;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.pm.PackageInfo;\r

-import android.content.pm.PackageManager;\r

 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.provider.MediaStore;\r
 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.provider.MediaStore;\r

-import android.telephony.TelephonyManager;\r

 import android.util.Log;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.widget.ArrayAdapter;\r
 import android.util.Log;\r
 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
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 \r


@@ -82,16 +75,17 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r

-        OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener  {\r
+    \r

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

-    private DataStorageManager mStorageManager;\r
-    private FileListFragment mFileList;\r

     private OCFile mCurrentDir;\r
     private String[] mDirs = null;\r
 \r
     private OCFile mCurrentDir;\r
     private String[] mDirs = null;\r
 \r

-    private SyncBroadcastReceiver syncBroadcastRevceiver;\r
+    private DataStorageManager mStorageManager;\r
+    private SyncBroadcastReceiver syncBroadcastReceiver;\r

     \r
     private View mLayoutView = null;\r
     \r
     private View mLayoutView = null;\r

+    private FileListFragment mFileList;\r

     \r
     private static final String KEY_DIR_ARRAY = "DIR_ARRAY";\r
     private static final String KEY_CURRENT_DIR = "DIR";\r
     \r
     private static final String KEY_DIR_ARRAY = "DIR_ARRAY";\r
     private static final String KEY_CURRENT_DIR = "DIR";\r


@@ -99,35 +93,37 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     private static final int DIALOG_ABOUT_APP = 2;\r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     private static final int DIALOG_ABOUT_APP = 2;\r

+    \r

     private static final int ACTION_SELECT_FILE = 1;\r
     private static final int ACTION_SELECT_FILE = 1;\r

+    //private static final int ACTION_CREATE_FIRST_ACCOUNT = 2; dvelasco: WIP\r

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

+        Log.i(getClass().toString(), "onCreate() start");\r

         super.onCreate(savedInstanceState);\r
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         super.onCreate(savedInstanceState);\r
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r

-        setProgressBarIndeterminateVisibility(false);\r
+        setSupportProgressBarIndeterminateVisibility(false);\r

 \r
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
         if(savedInstanceState != null){\r
 \r
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
         if(savedInstanceState != null){\r

-            mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
+            mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);   // this is never saved with this key :S\r

         }\r
         \r
         }\r
         \r

-        if (findViewById(R.id.file_list_view) == null) \r
-            mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r
+        mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r

         \r
         \r

-        //TODO: Dialog useless -> get rid of this\r
-        if (!accountsAreSetup()) {\r
+        if (AccountUtils.accountsAreSetup(this)) {\r
+            setContentView(mLayoutView);    \r
+            \r
+        } else  {\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
             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

-            \r
-        } else if (findViewById(R.id.file_list_view) == null) {\r
-            setContentView(mLayoutView);\r

         }\r
         \r
         }\r
         \r

+        Log.i(getClass().toString(), "onCreate() end");\r

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


@@ -196,8 +192,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      * Called, when the user selected something for uploading\r
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
      * Called, when the user selected something for uploading\r
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r

-        if (resultCode == RESULT_OK) {\r
-            if (requestCode == ACTION_SELECT_FILE) {\r
+        if (requestCode == ACTION_SELECT_FILE) {\r
+            if (resultCode == RESULT_OK) {\r

                 Uri selectedImageUri = data.getData();\r
     \r
                 String filemanagerstring = selectedImageUri.getPath();\r
                 Uri selectedImageUri = data.getData();\r
     \r
                 String filemanagerstring = selectedImageUri.getPath();\r


@@ -219,18 +215,25 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         AccountUtils.getCurrentOwnCloudAccount(this));\r
                 String remotepath = new String();\r
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
                         AccountUtils.getCurrentOwnCloudAccount(this));\r
                 String remotepath = new String();\r
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r

-                    remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j));\r
+                    remotepath += "/" + mDirectories.getItem(j);\r

                 }\r
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r
                 }\r
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r

-                remotepath += URLEncoder.encode(new File(filepath).getName());\r
+                remotepath += new File(filepath).getName();\r
+                remotepath = Uri.encode(remotepath, "/");\r

     \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
                 i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
                 startService(i);\r
             }\r
     \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
                 i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
                 startService(i);\r
             }\r

-        }\r
+            \r
+        }/* dvelasco: WIP - not working as expected ... yet :)\r
+             else if (requestCode == ACTION_CREATE_FIRST_ACCOUNT) {\r
+            if (resultCode != RESULT_OK) {\r
+                finish();   // the user cancelled the AuthenticatorActivity\r
+            }\r
+        }*/\r

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


@@ -251,6 +254,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
 \r
     @Override\r
     protected void onRestoreInstanceState(Bundle savedInstanceState) {\r

+        Log.i(getClass().toString(), "onRestoreInstanceState() start");\r

         super.onRestoreInstanceState(savedInstanceState);\r
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         super.onRestoreInstanceState(savedInstanceState);\r
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r


@@ -258,11 +262,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDirs != null)\r
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r
         if (mDirs != null)\r
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r

-        mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
+        mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
+        Log.i(getClass().toString(), "onRestoreInstanceState() end");\r

     }\r
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
     }\r
     \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r

+        Log.i(getClass().toString(), "onSaveInstanceState() start");\r

         super.onSaveInstanceState(outState);\r
         if(mDirectories != null && mDirectories.getCount() != 0){\r
             mDirs = new String[mDirectories.getCount()-1];\r
         super.onSaveInstanceState(outState);\r
         if(mDirectories != null && mDirectories.getCount() != 0){\r
             mDirs = new String[mDirectories.getCount()-1];\r


@@ -271,21 +277,31 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             }\r
         }\r
         outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r
             }\r
         }\r
         outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r

-        outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir);\r
+        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        Log.i(getClass().toString(), "onSaveInstanceState() end");\r

     }\r
 \r
     @Override\r
     protected void onResume() {\r
     }\r
 \r
     @Override\r
     protected void onResume() {\r

+        Log.i(getClass().toString(), "onResume() start");\r

         super.onResume();\r
         super.onResume();\r

-        \r
-        if (accountsAreSetup()) {\r

 \r
 \r

-            setContentView(mLayoutView);    // this should solve the crash by repeated inflating in big screens (DROIDCLOUD-27)\r
+        if (!AccountUtils.accountsAreSetup(this)) {\r
+            /*Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
+            intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+            //startActivity(intent);\r
+            startActivityForResult(intent, ACTION_CREATE_FIRST_ACCOUNT);*/\r
+            \r
+        } else {    // at least an account exist: normal operation\r
+\r
+            // set the layout only if it couldn't be set in onCreate\r
+            if (findViewById(R.id.file_list_view) == null)\r
+                setContentView(mLayoutView);\r

 \r
             // Listen for sync messages\r
             IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
 \r
             // Listen for sync messages\r
             IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r

-            syncBroadcastRevceiver = new SyncBroadcastReceiver();\r
-            registerReceiver(syncBroadcastRevceiver, syncIntentFilter);\r
+            syncBroadcastReceiver = new SyncBroadcastReceiver();\r
+            registerReceiver(syncBroadcastReceiver, syncIntentFilter);\r

         \r
             // Storage manager initialization\r
             mStorageManager = new FileDataStorageManager(\r
         \r
             // Storage manager initialization\r
             mStorageManager = new FileDataStorageManager(\r


@@ -294,20 +310,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
             // File list\r
             mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         \r
             // File list\r
             mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r

-        \r
+            \r

             // Figure out what directory to list. \r
             // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
             if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r
                 mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
             // Figure out what directory to list. \r
             // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
             if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r
                 mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r

-                if(!mCurrentDir.isDirectory()){\r
+                if(mCurrentDir != null && !mCurrentDir.isDirectory()){\r

                     mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
                 }\r
             \r
                 // Clear intent extra, so rotating the screen will not return us to this directory\r
                 getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
                     mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
                 }\r
             \r
                 // Clear intent extra, so rotating the screen will not return us to this directory\r
                 getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r

-            } else {\r
-                mCurrentDir = mStorageManager.getFileByPath("/");\r

             }\r
             }\r

+            \r
+            if (mCurrentDir == null)\r
+                mCurrentDir = mStorageManager.getFileByPath("/");\r

                 \r
             // Drop-Down navigation and file list restore\r
             mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
                 \r
             // Drop-Down navigation and file list restore\r
             mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r


@@ -350,15 +367,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             // List dir here\r
             mFileList.listDirectory(mCurrentDir);\r
         }\r
             // List dir here\r
             mFileList.listDirectory(mCurrentDir);\r
         }\r

+        Log.i(getClass().toString(), "onResume() end");\r

     }\r
 \r
     @Override\r
     protected void onPause() {\r
     }\r
 \r
     @Override\r
     protected void onPause() {\r

+        Log.i(getClass().toString(), "onPause() start");\r

         super.onPause();\r
         super.onPause();\r

-        if (syncBroadcastRevceiver != null) {\r
-            unregisterReceiver(syncBroadcastRevceiver);\r
-            syncBroadcastRevceiver = null;\r
+        if (syncBroadcastReceiver != null) {\r
+            unregisterReceiver(syncBroadcastReceiver);\r
+            syncBroadcastReceiver = null;\r

         }\r
         }\r

+        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        Log.i(getClass().toString(), "onPause() end");\r

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


@@ -409,10 +430,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             }\r
     \r
                             // Figure out the path where the dir needs to be created\r
                             }\r
     \r
                             // Figure out the path where the dir needs to be created\r

-                            String path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
+                            String path;\r
+                            if (mCurrentDir == null) {\r
+                                // this is just a patch; we should ensure that mCurrentDir never is null\r
+                                if (!mStorageManager.fileExists("/")) {\r
+                                    OCFile file = new OCFile("/");\r
+                                    mStorageManager.saveFile(file);\r
+                                }\r
+                                mCurrentDir = mStorageManager.getFileByPath("/");\r
+                            }\r
+                            path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r

                             \r
                             // Create directory\r
                             \r
                             // Create directory\r

-                            path += directoryName + "/";\r
+                            path += Uri.encode(directoryName) + "/";\r

                             Thread thread = new Thread(new DirectoryCreator(path, a));\r
                             thread.start();\r
     \r
                             Thread thread = new Thread(new DirectoryCreator(path, a));\r
                             thread.start();\r
     \r


@@ -505,18 +535,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         return !mDirectories.isEmpty();\r
     }\r
 \r
         return !mDirectories.isEmpty();\r
     }\r
 \r

-    /**\r
-     * Checks, whether or not there are any ownCloud accounts 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

     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r


@@ -583,12 +601,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     .getStringExtra(FileSyncService.ACCOUNT_NAME);\r
             Log.d("FileDisplay", "sync of account " + account_name\r
                     + " is in_progress: " + inProgress);\r
                     .getStringExtra(FileSyncService.ACCOUNT_NAME);\r
             Log.d("FileDisplay", "sync of account " + account_name\r
                     + " is in_progress: " + inProgress);\r

-            setProgressBarIndeterminateVisibility(inProgress);\r
+            setSupportProgressBarIndeterminateVisibility(inProgress);\r

             if (!inProgress) {\r
             if (!inProgress) {\r

-                FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
+                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r

                         .findFragmentById(R.id.fileList);\r
                         .findFragmentById(R.id.fileList);\r

-                if (fileListFramgent != null)\r
-                    fileListFramgent.listDirectory();\r
+                if (fileListFragment != null)\r
+                    fileListFragment.listDirectory();\r

             }\r
         }\r
 \r
             }\r
         }\r
 \r