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 8eafbf7..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


@@ -48,6 +49,7 @@ import android.os.Handler;
 import android.os.IBinder;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
 import android.os.IBinder;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r

+import android.support.v4.app.Fragment;\r

 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r
 import android.view.View;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r
 import android.view.View;\r


@@ -87,6 +89,8 @@ import com.owncloud.android.ui.dialog.ChangelogDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r

+import com.owncloud.android.ui.fragment.FileFragment;\r
+import com.owncloud.android.ui.fragment.FilePreviewFragment;\r

 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 \r
 import com.owncloud.android.R;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 \r
 import com.owncloud.android.R;\r


@@ -134,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


@@ -289,8 +293,13 @@ 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

-                transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); // empty FileDetailFragment\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
+                }\r

                 mCurrentFile = null;\r
                 mCurrentFile = null;\r

+                \r

             } else {\r
                 transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
             }\r
             } else {\r
                 transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
             }\r


@@ -312,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


@@ -343,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


@@ -360,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


@@ -504,11 +513,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\r
         \r
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\r

-            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
-            if (fileDetails != null && !fileDetails.isEmpty()) {\r
+            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (fileFragment != null && (fileFragment instanceof FilePreviewFragment || !((FileDetailFragment) fileFragment).isEmpty())) {\r

                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r

-                transaction.remove(fileDetails);\r
-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                \r

                 transaction.commit();\r
             }\r
         }\r
                 transaction.commit();\r
             }\r
         }\r


@@ -526,9 +534,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
         if (mDualPane) {\r
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
         if (mDualPane) {\r

-            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r

             if (fragment != null) {\r
             if (fragment != null) {\r

-                OCFile file = fragment.getDisplayedFile();\r
+                OCFile file = fragment.getFile();\r

                 if (file != null) {\r
                     outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);\r
                 }\r
                 if (file != null) {\r
                     outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);\r
                 }\r


@@ -999,11 +1007,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\r
         \r
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\r

-            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
-            if (fileDetails != null && !fileDetails.isEmpty()) {\r
+            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (fileFragment != null && (fileFragment instanceof FilePreviewFragment || !((FileDetailFragment) fileFragment).isEmpty())) {\r

                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r

-                transaction.remove(fileDetails);\r
-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                \r

                 transaction.commit();\r
             }\r
         }\r
                 transaction.commit();\r
             }\r
         }\r


@@ -1020,8 +1027,12 @@ 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

-            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
-            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\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
+            }\r
+            //transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r

             transaction.commit();\r
             \r
         } else {    // small or medium screen device -> new Activity\r
             transaction.commit();\r
             \r
         } else {    // small or medium screen device -> new Activity\r


@@ -1090,9 +1101,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (mFileList != null)\r
                 mFileList.listDirectory();\r
             if (mDualPane) {\r
             if (mFileList != null)\r
                 mFileList.listDirectory();\r
             if (mDualPane) {\r

-                FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
-                if (fragment != null)\r
-                    fragment.updateFileDetails(false);\r
+                Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+                if (fragment != null && fragment instanceof FileDetailFragment) {\r
+                    ((FileDetailFragment)fragment).updateFileDetails(false);\r
+                }\r

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


@@ -1172,8 +1184,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             msg.show();\r
             OCFile removedFile = operation.getFile();\r
             if (mDualPane) {\r
             msg.show();\r
             OCFile removedFile = operation.getFile();\r
             if (mDualPane) {\r

-                FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
-                if (details != null && removedFile.equals(details.getDisplayedFile()) ) {\r
+                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+                if (details != null && removedFile.equals(details.getFile())) {\r

                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                     transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
                     transaction.commit();\r
                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                     transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
                     transaction.commit();\r


@@ -1205,9 +1217,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         OCFile renamedFile = operation.getFile();\r
         if (result.isSuccess()) {\r
             if (mDualPane) {\r
         OCFile renamedFile = operation.getFile();\r
         if (result.isSuccess()) {\r
             if (mDualPane) {\r

-                FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
-                if (details != null && renamedFile.equals(details.getDisplayedFile()) ) {\r
-                    details.updateFileDetails(renamedFile, AccountUtils.getCurrentOwnCloudAccount(this));\r
+                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+                if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) {\r
+                    ((FileDetailFragment) details).updateFileDetails(renamedFile, AccountUtils.getCurrentOwnCloudAccount(this));\r

                 }\r
             }\r
             if (mStorageManager.getFileById(renamedFile.getParentId()).equals(mCurrentDir)) {\r
                 }\r
             }\r
             if (mStorageManager.getFileById(renamedFile.getParentId()).equals(mCurrentDir)) {\r


@@ -1269,19 +1281,33 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             fileListFragment.listDirectory();\r
         }*/\r
         if (mDualPane) {\r
             fileListFragment.listDirectory();\r
         }*/\r
         if (mDualPane) {\r

-            FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
-            if (details != null && file.equals(details.getDisplayedFile()) ) {\r
+            FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (details != null && details instanceof FileDetailFragment && file.equals(details.getFile()) ) {\r

                 if (downloading || uploading) {\r
                 if (downloading || uploading) {\r

-                    details.updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));\r
+                    ((FileDetailFragment)details).updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));\r

                 } else {\r
                 } else {\r

-                    details.updateFileDetails(downloading || uploading);\r
+                    ((FileDetailFragment)details).updateFileDetails(downloading || uploading);\r

                 }\r
             }\r
         }\r
     }\r
 \r
 \r
                 }\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