send intent with filepath so details view can be updated

[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 5c02703..188537e 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,7 +18,10 @@
 \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 java.net.URLEncoder;\r
 import java.util.ArrayList;\r
 \r


@@ -38,6 +41,7 @@ import android.database.Cursor;
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.provider.MediaStore;\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.util.Log;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r


@@ -55,6 +59,7 @@ import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;\r
 \r
 import eu.alefzero.owncloud.AccountUtils;\r
 import com.actionbarsherlock.view.Window;\r
 \r
 import eu.alefzero.owncloud.AccountUtils;\r

+import eu.alefzero.owncloud.CrashHandler;\r

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


@@ -96,7 +101,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r

-        \r
+\r
+        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
+\r

         if(savedInstanceState != null){\r
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
         }\r
         if(savedInstanceState != null){\r
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
         }\r


@@ -225,6 +232,7 @@ 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

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


@@ -278,7 +286,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             \r
             // Clear intent extra, so rotating the screen will not return us to this directory\r
             getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
             \r
             // Clear intent extra, so rotating the screen will not return us to this directory\r
             getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r

-        } \r
+        } else {\r
+            mCurrentDir = mStorageManager.getFileByPath("/");\r
+        }\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


@@ -329,7 +339,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);\r
             syncBroadcastRevceiver = null;\r
         }\r
             unregisterReceiver(syncBroadcastRevceiver);\r
             syncBroadcastRevceiver = null;\r
         }\r

-    \r

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


@@ -354,7 +363,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r
             dirNameInput.setTextColor(typed_color);\r
             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r
             dirNameInput.setTextColor(typed_color);\r

-    \r

             builder.setPositiveButton(android.R.string.ok,\r
                     new OnClickListener() {\r
                         public void onClick(DialogInterface dialog, int which) {\r
             builder.setPositiveButton(android.R.string.ok,\r
                     new OnClickListener() {\r
                         public void onClick(DialogInterface dialog, int which) {\r


@@ -365,12 +373,11 @@ 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 = mCurrentDir.getRemotePath();\r
+                            String path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r

                             \r
                             // Create directory\r
                             path += directoryName + "/";\r
                             \r
                             // Create directory\r
                             path += directoryName + "/";\r

-                            Thread thread = new Thread(new DirectoryCreator(\r
-                                    path, a));\r
+                            Thread thread = new Thread(new DirectoryCreator(path, a));\r

                             thread.start();\r
     \r
                             // Save new directory in local database\r
                             thread.start();\r
     \r
                             // Save new directory in local database\r


@@ -558,6 +565,5 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
             startActivity(intent);\r
         }\r
             intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
             startActivity(intent);\r
         }\r

-    }\r
-\r
+    }    \r

 }\r
 }\r