X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/548fc80ea1482beb72b94a08b3df02149091c6e7..fd1704c49cfabc9607bc67d35b6f36afca0591ff:/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 137cd296..932fa513 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java +++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java @@ -17,29 +17,37 @@ */ package eu.alefzero.owncloud.ui.fragment; -import android.app.FragmentTransaction; +import java.util.List; + +import android.accounts.Account; +import android.accounts.AccountManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.net.Uri; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import android.widget.VideoView; import com.actionbarsherlock.app.SherlockFragment; import eu.alefzero.owncloud.DisplayUtils; -import eu.alefzero.owncloud.FileDownloader; import eu.alefzero.owncloud.R; +import eu.alefzero.owncloud.authenticator.AccountAuthenticator; import eu.alefzero.owncloud.datamodel.OCFile; +import eu.alefzero.owncloud.files.services.FileDownloader; +import eu.alefzero.owncloud.utils.OwnCloudVersion; /** * This Fragment is used to display the details about a file. @@ -50,35 +58,46 @@ import eu.alefzero.owncloud.datamodel.OCFile; public class FileDetailFragment extends SherlockFragment implements OnClickListener { - public static final String FILE = "FILE"; + public static final String EXTRA_FILE = "FILE"; - private Intent mIntent; - //private View mView; private DownloadFinishReceiver mDownloadFinishReceiver; - private OCFile mFile; - + private Intent mIntent; private int mLayout; - private boolean mEmptyLayout; + private View mView; + private OCFile mFile; + private static final String TAG = "FileDetailFragment"; /** - * Default constructor. When inflated by android -> display empty layout + * Default constructor - contains real layout */ - public FileDetailFragment() { - mLayout = R.layout.file_details_empty; - mEmptyLayout = true; + public FileDetailFragment(){ + mLayout = R.layout.file_details_fragment; } - + + /** + * Creates a dummy layout. For use if the user never has + * tapped on a file before + * + * @param useEmptyView If true, use empty layout + */ + public FileDetailFragment(boolean useEmptyView){ + if(useEmptyView){ + mLayout = R.layout.file_details_empty; + } else { + mLayout = R.layout.file_details_fragment; + } + } + /** - * Custom construtor. Use with a {@link FragmentTransaction}. The intent has - * to contain {@link FileDetailFragment#FILE} with an OCFile and also - * {@link FileDownloader#EXTRA_ACCOUNT} with the account. + * Use this when creating the fragment and display + * a file at the same time * - * @param intent Intent with an account and a file in it for rendering + * @param showDetailsIntent The Intent with the required parameters + * @see FileDetailFragment#updateFileDetails(Intent) */ - public FileDetailFragment(Intent intent) { + public FileDetailFragment(Intent showDetailsIntent) { + mIntent = showDetailsIntent; mLayout = R.layout.file_details_fragment; - mIntent = intent; - mEmptyLayout = false; } @Override @@ -97,6 +116,47 @@ public class FileDetailFragment extends SherlockFragment implements mDownloadFinishReceiver = null; } + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = null; + view = inflater.inflate(mLayout, container, false); + mView = view; + if(mLayout == R.layout.file_details_fragment){ + // Phones will launch an activity with this intent + if(mIntent == null){ + mIntent = getActivity().getIntent(); + } + updateFileDetails(); + } + + return view; + } + + @Override + public View getView() { + return super.getView() == null ? mView : super.getView(); + } + + @Override + public void onClick(View v) { + Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show(); + Intent i = new Intent(getActivity(), FileDownloader.class); + i.putExtra(FileDownloader.EXTRA_ACCOUNT, + mIntent.getParcelableExtra(FileDownloader.EXTRA_ACCOUNT)); + i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath()); + i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength()); + getActivity().startService(i); + } + + /** + * Can be used to get the file that is currently being displayed. + * @return The file on the screen. + */ + public OCFile getDisplayedFile(){ + return mFile; + } + /** * Use this method to signal this Activity that it shall update its view. * @@ -104,7 +164,7 @@ public class FileDetailFragment extends SherlockFragment implements * this file The intent needs to have these extras: *

* - * {@link FileDetailFragment#FILE}: An {@link OCFile} + * {@link FileDetailFragment#EXTRA_FILE}: An {@link OCFile} * {@link FileDownloader#EXTRA_ACCOUNT}: The Account that file * belongs to (required for downloading) */ @@ -113,8 +173,12 @@ public class FileDetailFragment extends SherlockFragment implements updateFileDetails(); } + /** + * Updates the view with all relevant details about that file. + */ private void updateFileDetails() { - mFile = mIntent.getParcelableExtra(FILE); + mFile = mIntent.getParcelableExtra(EXTRA_FILE); + Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn); if (mFile != null) { // set file details @@ -122,106 +186,133 @@ public class FileDetailFragment extends SherlockFragment implements setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile .getMimetype())); setFilesize(mFile.getFileLength()); - - // set file preview if available and possible - VideoView videoView = (VideoView) getView() - .findViewById(R.id.videoView1); - videoView.setVisibility(View.INVISIBLE); - if (mFile.getStoragePath() == null) { - ImageView imageView = (ImageView) getView().findViewById( - R.id.imageView2); - imageView.setImageResource(R.drawable.download); - imageView.setOnClickListener(this); - } else { - if (mFile.getMimetype().startsWith("image/")) { - ImageView imageView = (ImageView) getView() - .findViewById(R.id.imageView2); - Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath()); - imageView.setImageBitmap(bmp); - } else if (mFile.getMimetype().startsWith("video/")) { - videoView.setVisibility(View.VISIBLE); - videoView.setVideoPath(mFile.getStoragePath()); - videoView.start(); + if(ocVersionSupportsTimeCreated()){ + setTimeCreated(mFile.getCreationTimestamp()); + } + + setTimeModified(mFile.getModificationTimestamp()); + + // Update preview + if (mFile.getStoragePath() != null) { + try { + if (mFile.getMimetype().startsWith("image/")) { + ImageView preview = (ImageView) getView().findViewById( + R.id.fdPreview); + Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath()); + preview.setImageBitmap(bmp); + } + } catch (OutOfMemoryError e) { + Log.e(TAG, "Out of memory occured for file with size " + mFile.getFileLength()); } + downloadButton.setText(R.string.filedetails_open); + downloadButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(Intent.ACTION_VIEW); + i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mFile.getMimetype()); + List list = getActivity().getPackageManager().queryIntentActivities(i, PackageManager.MATCH_DEFAULT_ONLY); + if (list.size() > 0) { + startActivity(i); + } else { + Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show(); + } + } + }); + } else { + // Make download button effective + downloadButton.setOnClickListener(this); } } } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = null; - view = inflater.inflate(mLayout, container, false); - return view; - } - - @Override - public void onStart() { - super.onStart(); - - // Fill in required information about file displaying - if(mIntent == null){ - mIntent = getActivity().getIntent(); - } - - // Fill in the details if the layout is not empty - if(!mEmptyLayout){ - updateFileDetails(); - } - - } - + + /** + * Updates the filename in view + * @param filename to set + */ private void setFilename(String filename) { - TextView tv = (TextView) getView().findViewById(R.id.textView1); + TextView tv = (TextView) getView().findViewById(R.id.fdFilename); if (tv != null) tv.setText(filename); } + /** + * Updates the MIME type in view + * @param mimetype to set + */ private void setFiletype(String mimetype) { - TextView tv = (TextView) getView().findViewById(R.id.textView2); + TextView tv = (TextView) getView().findViewById(R.id.fdType); if (tv != null) tv.setText(mimetype); } + /** + * Updates the file size in view + * @param filesize in bytes to set + */ private void setFilesize(long filesize) { - TextView tv = (TextView) getView().findViewById(R.id.textView3); + TextView tv = (TextView) getView().findViewById(R.id.fdSize); if (tv != null) - tv.setText(DisplayUtils.bitsToHumanReadable(filesize)); + tv.setText(DisplayUtils.bytesToHumanReadable(filesize)); } - + /** - * Use this to check if the correct layout is loaded. When android - * instanciates this class using the default constructor, the layout will be - * empty. - * - * Once a user touches a file for the first time, you must instanciate a new - * Fragment with the new FileDetailFragment(true) to inflate the actual - * details - * - * @return If the layout is empty, this method will return true, otherwise - * false + * Updates the time that the file was created in view + * @param milliseconds Unix time to set */ - public boolean isEmptyLayout() { - return mEmptyLayout; + private void setTimeCreated(long milliseconds){ + TextView tv = (TextView) getView().findViewById(R.id.fdCreated); + TextView tvLabel = (TextView) getView().findViewById(R.id.fdCreatedLabel); + if(tv != null){ + tv.setText(DisplayUtils.unixTimeToHumanReadable(milliseconds)); + tv.setVisibility(View.VISIBLE); + tvLabel.setVisibility(View.VISIBLE); + } } - - @Override - public void onClick(View v) { - Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show(); - Intent i = new Intent(getActivity(), FileDownloader.class); - i.putExtra(FileDownloader.EXTRA_ACCOUNT, - mIntent.getParcelableExtra(FileDownloader.EXTRA_ACCOUNT)); - i.putExtra(FileDownloader.EXTRA_FILE_PATH, - mIntent.getStringExtra(FileDownloader.EXTRA_FILE_PATH)); - getActivity().startService(i); + + /** + * Updates the time that the file was last modified + * @param milliseconds Unix time to set + */ + private void setTimeModified(long milliseconds){ + TextView tv = (TextView) getView().findViewById(R.id.fdModified); + if(tv != null){ + tv.setText(DisplayUtils.unixTimeToHumanReadable(milliseconds)); + } + } + + /** + * In ownCloud 3.0.3 and 4.0.0 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 + * ownCloud has this fix. + * @return True, if ownCloud the ownCloud version is > 3.0.4 and 4.0.1 + */ + private boolean ocVersionSupportsTimeCreated(){ + if(mIntent != null){ + Account ocAccount = mIntent.getParcelableExtra(FileDownloader.EXTRA_ACCOUNT); + if(ocAccount != null){ + AccountManager accManager = (AccountManager) getActivity().getSystemService(Context.ACCOUNT_SERVICE); + OwnCloudVersion ocVersion = new OwnCloudVersion(accManager + .getUserData(ocAccount, AccountAuthenticator.KEY_OC_VERSION)); + if(ocVersion.compareTo(new OwnCloudVersion(0x030004)) >= 0 || ocVersion.compareTo(new OwnCloudVersion(0x040001)) >= 0){ + return true; + } + } + } + return false; } + /** + * Once the file download has finished -> update view + * @author Bartek Przybylski + */ private class DownloadFinishReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - updateFileDetails(); + ((OCFile)mIntent.getParcelableExtra(EXTRA_FILE)).setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH)); + updateFileDetails(mIntent); } - + } }