X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/147227040b0b37f28d9819b6514ecf882be26547..c175ba68cd46504c809284ee95557bb27746ffdf:/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java index bbc2473e..6a34c6d0 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java +++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java @@ -22,14 +22,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HttpException; -import org.apache.commons.httpclient.cookie.CookiePolicy; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.httpclient.params.HttpConnectionManagerParams; -import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; @@ -37,20 +34,15 @@ import org.apache.http.message.BasicNameValuePair; import org.apache.http.protocol.HTTP; import org.apache.jackrabbit.webdav.client.methods.DavMethodBase; import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; -import org.apache.jackrabbit.webdav.client.methods.MoveMethod; import org.apache.jackrabbit.webdav.client.methods.PropFindMethod; import org.json.JSONException; import org.json.JSONObject; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.AlertDialog; -import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnDismissListener; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Resources.NotFoundException; @@ -58,14 +50,10 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.BitmapFactory.Options; import android.graphics.Point; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.os.Environment; import android.os.Handler; -import android.preference.PreferenceActivity.Header; import android.support.v4.app.FragmentTransaction; import android.util.Log; import android.view.Display; @@ -77,7 +65,6 @@ import android.view.WindowManager.LayoutParams; import android.webkit.MimeTypeMap; import android.widget.Button; import android.widget.CheckBox; -import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -95,6 +82,7 @@ import eu.alefzero.owncloud.files.services.FileDownloader; import eu.alefzero.owncloud.ui.activity.FileDisplayActivity; import eu.alefzero.owncloud.utils.OwnCloudVersion; import eu.alefzero.webdav.WebdavClient; +import eu.alefzero.webdav.WebdavUtils; /** * This Fragment is used to display the details about a file. @@ -168,9 +156,11 @@ public class FileDetailFragment extends SherlockFragment implements if (mLayout == R.layout.file_details_fragment) { mView.findViewById(R.id.fdKeepInSync).setOnClickListener(this); - //mView.findViewById(R.id.fdShareBtn).setOnClickListener(this); mView.findViewById(R.id.fdRenameBtn).setOnClickListener(this); + mView.findViewById(R.id.fdDownloadBtn).setOnClickListener(this); + mView.findViewById(R.id.fdOpenBtn).setOnClickListener(this); mView.findViewById(R.id.fdRemoveBtn).setOnClickListener(this); + //mView.findViewById(R.id.fdShareBtn).setOnClickListener(this); mPreview = (ImageView)mView.findViewById(R.id.fdPreview); } @@ -196,6 +186,7 @@ public class FileDetailFragment extends SherlockFragment implements IntentFilter filter = new IntentFilter( FileDownloader.DOWNLOAD_FINISH_MESSAGE); getActivity().registerReceiver(mDownloadFinishReceiver, filter); + mPreview = (ImageView)mView.findViewById(R.id.fdPreview); } @Override @@ -219,13 +210,16 @@ public class FileDetailFragment extends SherlockFragment implements public void onClick(View v) { switch (v.getId()) { case R.id.fdDownloadBtn: { - //Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show(); Intent i = new Intent(getActivity(), FileDownloader.class); i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount); i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath()); - i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getURLDecodedRemotePath()); + i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath()); i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength()); - v.setEnabled(false); + + // update ui + Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show(); + setButtonsForDownloading(); + getActivity().startService(i); break; } @@ -234,7 +228,7 @@ public class FileDetailFragment extends SherlockFragment implements mFile.setKeepInSync(cb.isChecked()); FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver()); fdsm.saveFile(mFile); - if (mFile.keepInSync() && !mFile.isDownloaded()) { + if (mFile.keepInSync()) { onClick(getView().findViewById(R.id.fdDownloadBtn)); } break; @@ -251,6 +245,47 @@ public class FileDetailFragment extends SherlockFragment implements confDialog.show(getFragmentManager(), FTAG_CONFIRMATION); break; } + case R.id.fdOpenBtn: { + String storagePath = mFile.getStoragePath(); + String encodedStoragePath = WebdavUtils.encodePath(storagePath); + try { + Intent i = new Intent(Intent.ACTION_VIEW); + i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype()); + i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + startActivity(i); + + } catch (Throwable t) { + Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype()); + boolean toastIt = true; + String mimeType = ""; + try { + Intent i = new Intent(Intent.ACTION_VIEW); + mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1)); + if (mimeType != null && !mimeType.equals(mFile.getMimetype())) { + i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType); + i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + startActivity(i); + toastIt = false; + } + + } catch (IndexOutOfBoundsException e) { + Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath); + + } catch (ActivityNotFoundException e) { + Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension"); + + } catch (Throwable th) { + Log.e(TAG, "Unexpected problem when opening: " + storagePath, th); + + } finally { + if (toastIt) { + Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show(); + } + } + + } + break; + } default: Log.e(TAG, "Incorrect view clicked!"); } @@ -311,7 +346,6 @@ public class FileDetailFragment extends SherlockFragment implements if (mFile != null && mAccount != null && mLayout == R.layout.file_details_fragment) { - Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn); // set file details setFilename(mFile.getFileName()); setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile @@ -325,23 +359,30 @@ public class FileDetailFragment extends SherlockFragment implements CheckBox cb = (CheckBox)getView().findViewById(R.id.fdKeepInSync); cb.setChecked(mFile.keepInSync()); - - if (mFile.getStoragePath() != null) { + + // configure UI for depending upon local state of the file + if (mFile.isDownloading()) { + setButtonsForDownloading(); + + } else if (mFile.isDown()) { // Update preview if (mFile.getMimetype().startsWith("image/")) { BitmapLoader bl = new BitmapLoader(); bl.execute(new String[]{mFile.getStoragePath()}); } + setButtonsForDown(); + // Change download button to open button - downloadButton.setText(R.string.filedetails_open); + /*downloadButton.setText(R.string.filedetails_open); downloadButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { String storagePath = mFile.getStoragePath(); + String encodedStoragePath = WebdavUtils.encodePath(storagePath); try { Intent i = new Intent(Intent.ACTION_VIEW); - i.setDataAndType(Uri.parse("file://"+ storagePath), mFile.getMimetype()); + i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype()); i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); startActivity(i); @@ -353,7 +394,7 @@ public class FileDetailFragment extends SherlockFragment implements Intent i = new Intent(Intent.ACTION_VIEW); mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1)); if (mimeType != null && !mimeType.equals(mFile.getMimetype())) { - i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mimeType); + i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType); i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); startActivity(i); toastIt = false; @@ -376,10 +417,9 @@ public class FileDetailFragment extends SherlockFragment implements } } - }); + });*/ } else { - // Make download button effective - downloadButton.setOnClickListener(this); + setButtonsForRemote(); } } } @@ -441,6 +481,53 @@ public class FileDetailFragment extends SherlockFragment implements } /** + * Enables or disables buttons for a file being downloaded + */ + private void setButtonsForDownloading() { + if (!isEmpty()) { + Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn); + downloadButton.setText(R.string.filedetails_download_in_progress); + downloadButton.setEnabled(false); // TODO replace it with a 'cancel download' button + + // let's protect the user from himself ;) + ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false); + ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(false); + ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(false); + } + } + + /** + * Enables or disables buttons for a file locally available + */ + private void setButtonsForDown() { + if (!isEmpty()) { + Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn); + downloadButton.setText(R.string.filedetails_redownload); + downloadButton.setEnabled(true); + + ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(true); + ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true); + ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true); + } + } + + /** + * Enables or disables buttons for a file not locally available + */ + private void setButtonsForRemote() { + if (!isEmpty()) { + Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn); + downloadButton.setText(R.string.filedetails_download); + downloadButton.setEnabled(true); + + ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false); + ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true); + ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true); + } + } + + + /** * In ownCloud 3.X.X and 4.X.X there is a bug that SabreDAV does not return * the time that the file was created. There is a chance that this will * be fixed in future versions. Use this method to check if this version of @@ -466,17 +553,17 @@ public class FileDetailFragment extends SherlockFragment implements private class DownloadFinishReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (getView()!=null && getView().findViewById(R.id.fdDownloadBtn) != null) - getView().findViewById(R.id.fdDownloadBtn).setEnabled(true); - - if (intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)) { - mFile.setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH)); - updateFileDetails(); - } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) { - Toast.makeText(context, R.string.downloader_download_failed , Toast.LENGTH_SHORT).show(); + if (mFile != null) { + boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false); + String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); + if (mFile.getRemotePath().equals(downloadedRemotePath)) { + if (downloadWasFine) { + mFile.setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH)); + } + updateFileDetails(); // it updates the buttons; must be called although !downloadWasFine + } } } - } // this is a temporary class for sharing purposes, it need to be replaced in transfer service @@ -594,7 +681,6 @@ public class FileDetailFragment extends SherlockFragment implements } public void onDismiss(EditNameFragment dialog) { - Log.e("ASD","ondismiss"); if (dialog instanceof EditNameFragment) { if (((EditNameFragment)dialog).getResult()) { String newFilename = ((EditNameFragment)dialog).getNewFilename(); @@ -602,7 +688,7 @@ public class FileDetailFragment extends SherlockFragment implements if (!newFilename.equals(mFile.getFileName())) { FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver()); if (fdsm.getFileById(mFile.getFileId()) != null) { - OCFile newFile = new OCFile(fdsm.getFileById(mFile.getParentId()).getRemotePath()+"/"+newFilename); + OCFile newFile = new OCFile(fdsm.getFileById(mFile.getParentId()).getRemotePath() + OCFile.PATH_SEPARATOR + newFilename); newFile.setCreationTimestamp(mFile.getCreationTimestamp()); newFile.setFileId(mFile.getFileId()); newFile.setFileLength(mFile.getFileLength()); @@ -611,7 +697,13 @@ public class FileDetailFragment extends SherlockFragment implements newFile.setMimetype(mFile.getMimetype()); newFile.setModificationTimestamp(mFile.getModificationTimestamp()); newFile.setParentId(mFile.getParentId()); - newFile.setStoragePath(mFile.getStoragePath()); + if (mFile.isDown()) { + File f = new File(mFile.getStoragePath()); + Log.e(TAG, f.getAbsolutePath()); + f.renameTo(new File(f.getParent()+"/"+newFilename)); + Log.e(TAG, f.getAbsolutePath()); + newFile.setStoragePath(f.getAbsolutePath()); + } new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start(); @@ -619,7 +711,7 @@ public class FileDetailFragment extends SherlockFragment implements } } } else { - Log.e(TAG, "Unknown dialog intance passed to onDismissDalog: " + dialog.getClass().getCanonicalName()); + Log.e(TAG, "Unknown dialog instance passed to onDismissDalog: " + dialog.getClass().getCanonicalName()); } } @@ -643,11 +735,11 @@ public class FileDetailFragment extends SherlockFragment implements String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL); OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION)); String webdav_path = AccountUtils.getWebdavPath(ocv); - Log.d("ASD", ""+baseUrl + webdav_path + mOld.getRemotePath()); + Log.d("ASD", ""+baseUrl + webdav_path + WebdavUtils.encodePath(mOld.getRemotePath())); - Log.e("ASD", Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + mNew.getRemotePath()); - LocalMoveMethod move = new LocalMoveMethod(baseUrl + webdav_path + mOld.getRemotePath(), - Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + mNew.getRemotePath()); + Log.e("ASD", Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + WebdavUtils.encodePath(mNew.getRemotePath())); + LocalMoveMethod move = new LocalMoveMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mOld.getRemotePath()), + Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + WebdavUtils.encodePath(mNew.getRemotePath())); try { int status = wc.executeMethod(move); @@ -752,9 +844,11 @@ public class FileDetailFragment extends SherlockFragment implements } - private class RemoveRunnable implements Runnable { + /** Arbitrary timeout for deletion */ + public final static int DELETION_TIMEOUT = 5000; + Account mAccount; OCFile mFileToRemove; Handler mHandler; @@ -771,16 +865,13 @@ public class FileDetailFragment extends SherlockFragment implements String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL); OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION)); String webdav_path = AccountUtils.getWebdavPath(ocv); - Log.d("ASD", ""+baseUrl + webdav_path + mFileToRemove.getRemotePath()); + Log.d("ASD", ""+baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath())); - DeleteMethod delete = new DeleteMethod(baseUrl + webdav_path + mFileToRemove.getRemotePath()); - HttpMethodParams params = delete.getParams(); - params.setSoTimeout(1000); - delete.setParams(params); + DeleteMethod delete = new DeleteMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath())); boolean success = false; try { - int status = wc.executeMethod(delete); + int status = wc.executeMethod(delete, DELETION_TIMEOUT); if (delete.succeeded()) { FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver()); fdsm.removeFile(mFileToRemove); @@ -879,7 +970,7 @@ public class FileDetailFragment extends SherlockFragment implements Log.e("ASD", "W " + width + " SW " + screenwidth); if (width > screenwidth) { - scale = (int) Math.ceil((Math.ceil(Math.max(height, width) / screenwidth))); + scale = (int) Math.ceil((float)width / screenwidth); options.inSampleSize = scale; } @@ -903,7 +994,7 @@ public class FileDetailFragment extends SherlockFragment implements } @Override protected void onPostExecute(Bitmap result) { - if (result != null) { + if (result != null && mPreview != null) { mPreview.setImageBitmap(result); } }