Fixed ClassCastException in FileUploader

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index fbce7cb..3a27a69 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -21,6 +21,7 @@ package com.owncloud.android.ui.activity;
 import java.io.File;\r
 \r
 import android.accounts.Account;\r
 import java.io.File;\r
 \r
 import android.accounts.Account;\r

+import android.app.Activity;\r

 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r
 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r


@@ -137,7 +138,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     private static final String TAG = "FileDisplayActivity";\r
 \r
     \r
     private static final String TAG = "FileDisplayActivity";\r
 \r

-    private static int[] mMenuIdentifiersToPatch = {R.id.about_app};\r
+    private static int[] mMenuIdentifiersToPatch = {R.id.action_about_app};\r

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


@@ -292,7 +293,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
             if (mCurrentFile != null) {\r
         if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
             if (mCurrentFile != null) {\r

-                if (FilePreviewFragment.canBePreviewed(mCurrentFile)) {\r
+                if (mCurrentFile.isDown() && FilePreviewFragment.canBePreviewed(mCurrentFile)) {\r

                     transaction.replace(R.id.file_details_container, new FilePreviewFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
                 } else {\r
                     transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
                     transaction.replace(R.id.file_details_container, new FilePreviewFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
                 } else {\r
                     transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r


@@ -320,7 +321,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         MenuInflater inflater = getSherlock().getMenuInflater();\r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         MenuInflater inflater = getSherlock().getMenuInflater();\r

-            inflater.inflate(R.menu.menu, menu);\r
+            inflater.inflate(R.menu.main_menu, menu);\r

             \r
             patchHiddenAccents(menu);\r
             \r
             \r
             patchHiddenAccents(menu);\r
             \r


@@ -351,11 +352,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public boolean onOptionsItemSelected(MenuItem item) {\r
         boolean retval = true;\r
         switch (item.getItemId()) {\r
     public boolean onOptionsItemSelected(MenuItem item) {\r
         boolean retval = true;\r
         switch (item.getItemId()) {\r

-            case R.id.createDirectoryItem: {\r
+            case R.id.action_create_dir: {\r

                 showDialog(DIALOG_CREATE_DIR);\r
                 break;\r
             }\r
                 showDialog(DIALOG_CREATE_DIR);\r
                 break;\r
             }\r

-            case R.id.startSync: {\r
+            case R.id.action_sync_account: {\r

                 startSynchronization();\r
                 break;\r
             }\r
                 startSynchronization();\r
                 break;\r
             }\r


@@ -368,7 +369,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 startActivity(settingsIntent);\r
                 break;\r
             }\r
                 startActivity(settingsIntent);\r
                 break;\r
             }\r

-            case R.id.about_app : {\r
+            case R.id.action_about_app: {\r

                 showDialog(DIALOG_ABOUT_APP);\r
                 break;\r
             }\r
                 showDialog(DIALOG_ABOUT_APP);\r
                 break;\r
             }\r


@@ -1026,7 +1027,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDualPane) {\r
             // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'\r
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
         if (mDualPane) {\r
             // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'\r
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r

-            if (FilePreviewFragment.canBePreviewed(file)) {\r
+            if (file != null && file.isDown() && FilePreviewFragment.canBePreviewed(file)) {\r

                 transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
             } else {\r
                 transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
                 transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
             } else {\r
                 transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r


@@ -1292,7 +1293,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
 \r
     }\r
 \r
 \r

-    \r
+    @Override\r
+    public void showFragmentWithDetails(OCFile file) {\r
+        if (mDualPane) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); \r
+            transaction.commit();\r
+            \r
+        } else {\r
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);\r
+            startActivity(showDetailsIntent);\r
+        }\r
+    }\r

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