X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e8c9e5b09a18d1fa8a764046b7da1402fada46f1..93de9f91d56ec3ff6ccd1d26df75dc1293e861bb:/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 45ec0a9a..8abf5696 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java +++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java @@ -17,30 +17,67 @@ */ package eu.alefzero.owncloud.ui.fragment; +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; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.protocol.HTTP; +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.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; 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.Bundle; +import android.preference.PreferenceActivity.Header; import android.util.Log; +import android.view.Display; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.webkit.MimeTypeMap; import android.widget.Button; +import android.widget.CheckBox; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; import com.actionbarsherlock.app.SherlockFragment; +import eu.alefzero.owncloud.AccountUtils; 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.FileDataStorageManager; import eu.alefzero.owncloud.datamodel.OCFile; +import eu.alefzero.owncloud.files.services.FileDownloader; +import eu.alefzero.owncloud.utils.OwnCloudVersion; +import eu.alefzero.webdav.WebdavClient; /** * This Fragment is used to display the details about a file. @@ -52,47 +89,79 @@ public class FileDetailFragment extends SherlockFragment implements OnClickListener { public static final String EXTRA_FILE = "FILE"; + public static final String EXTRA_ACCOUNT = "ACCOUNT"; - private DownloadFinishReceiver mDownloadFinishReceiver; - private Intent mIntent; private int mLayout; private View mView; private OCFile mFile; + private Account mAccount; + + private DownloadFinishReceiver mDownloadFinishReceiver; + private static final String TAG = "FileDetailFragment"; + public static final String FTAG = "FileDetails"; + /** - * Default constructor - contains real layout + * Creates an empty details fragment. + * + * It's necessary to keep a public constructor without parameters; the system uses it when tries to reinstantiate a fragment automatically. */ - public FileDetailFragment(){ - mLayout = R.layout.file_details_fragment; + public FileDetailFragment() { + mFile = null; + mAccount = null; + mLayout = R.layout.file_details_empty; } + /** - * Creates a dummy layout. For use if the user never has - * tapped on a file before + * Creates a details fragment. * - * @param useEmptyView If true, use empty layout + * When 'fileToDetail' or 'ocAccount' are null, creates a dummy layout (to use when a file wasn't tapped before). + * + * @param fileToDetail An {@link OCFile} to show in the fragment + * @param ocAccount An ownCloud account; needed to start downloads */ - public FileDetailFragment(boolean useEmptyView){ - if(useEmptyView){ - mLayout = R.layout.file_details_empty; - } else { + public FileDetailFragment(OCFile fileToDetail, Account ocAccount){ + mFile = fileToDetail; + mAccount = ocAccount; + mLayout = R.layout.file_details_empty; + + if(fileToDetail != null && ocAccount != null) { mLayout = R.layout.file_details_fragment; } } - /** - * Use this when creating the fragment and display - * a file at the same time - * - * @param showDetailsIntent The Intent with the required parameters - * @see FileDetailFragment#updateFileDetails(Intent) - */ - public FileDetailFragment(Intent showDetailsIntent) { - mIntent = showDetailsIntent; - mLayout = R.layout.file_details_fragment; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + super.onCreateView(inflater, container, savedInstanceState); + + if (savedInstanceState != null) { + mFile = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE); + mAccount = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_ACCOUNT); + } + + View view = null; + view = inflater.inflate(mLayout, container, false); + mView = view; + + updateFileDetails(); + return view; + } + + + @Override + public void onSaveInstanceState(Bundle outState) { + Log.i(getClass().toString(), "onSaveInstanceState() start"); + super.onSaveInstanceState(outState); + outState.putParcelable(FileDetailFragment.EXTRA_FILE, mFile); + outState.putParcelable(FileDetailFragment.EXTRA_ACCOUNT, mAccount); + Log.i(getClass().toString(), "onSaveInstanceState() end"); } + @Override public void onResume() { super.onResume(); @@ -110,37 +179,46 @@ public class FileDetailFragment extends SherlockFragment implements } @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.getPath()); - getActivity().startService(i); + if (v.getId() == 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_SIZE, mFile.getFileLength()); + v.setEnabled(false); + getActivity().startService(i); + } else if (v.getId() == R.id.fdKeepInSync) { + CheckBox cb = (CheckBox) getView().findViewById(R.id.fdKeepInSync); + mFile.setKeepInSync(cb.isChecked()); + FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver()); + fdsm.saveFile(mFile); + if (mFile.keepInSync() && !mFile.isDownloaded()) { + onClick(getView().findViewById(R.id.fdDownloadBtn)); + } + }/* else if (v.getId() == R.id.fdShareBtn) { + Thread t = new Thread(new ShareRunnable(mFile.getRemotePath())); + t.start(); + }*/ } + + /** + * Check if the fragment was created with an empty layout. An empty fragment can't show file details, must be replaced. + * + * @return True when the fragment was created with the empty layout. + */ + public boolean isEmpty() { + return mLayout == R.layout.file_details_empty; + } + + /** * Can be used to get the file that is currently being displayed. * @return The file on the screen. @@ -152,54 +230,148 @@ public class FileDetailFragment extends SherlockFragment implements /** * Use this method to signal this Activity that it shall update its view. * - * @param intent The {@link Intent} that contains extra information about - * this file The intent needs to have these extras: - *
- *
- * {@link FileDetailFragment#EXTRA_FILE}: An {@link OCFile}
- * {@link FileDownloader#EXTRA_ACCOUNT}: The Account that file
- * belongs to (required for downloading)
+ * @param file : An {@link OCFile}
*/
- public void updateFileDetails(Intent intent) {
- mIntent = intent;
+ public void updateFileDetails(OCFile file, Account ocAccount) {
+ mFile = file;
+ mAccount = ocAccount;
updateFileDetails();
}
+
/**
* Updates the view with all relevant details about that file.
*/
- private void updateFileDetails() {
- mFile = mIntent.getParcelableExtra(EXTRA_FILE);
- Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);
+ public void updateFileDetails() {
- if (mFile != null) {
+ 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
.getMimetype()));
setFilesize(mFile.getFileLength());
- setTimeCreated(mFile.getCreationTimestamp());
+ if(ocVersionSupportsTimeCreated()){
+ setTimeCreated(mFile.getCreationTimestamp());
+ }
+
setTimeModified(mFile.getModificationTimestamp());
- // Update preview
+ CheckBox cb = (CheckBox)getView().findViewById(R.id.fdKeepInSync);
+ cb.setChecked(mFile.keepInSync());
+ cb.setOnClickListener(this);
+ //getView().findViewById(R.id.fdShareBtn).setOnClickListener(this);
+
if (mFile.getStoragePath() != null) {
+ // Update preview
+ ImageView preview = (ImageView) getView().findViewById(R.id.fdPreview);
try {
if (mFile.getMimetype().startsWith("image/")) {
- ImageView preview = (ImageView) getView().findViewById(
- R.id.fdPreview);
- Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath());
- preview.setImageBitmap(bmp);
+ BitmapFactory.Options options = new Options();
+ options.inScaled = true;
+ options.inPurgeable = true;
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
+ options.inPreferQualityOverSpeed = false;
+ }
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+ options.inMutable = false;
+ }
+
+ Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath(), options);
+
+ if (bmp != null) {
+ int width = options.outWidth;
+ int height = options.outHeight;
+ int scale = 1;
+ boolean recycle = false;
+ if (width >= 2048 || height >= 2048) {
+ scale = (int) (Math.ceil(Math.max(height, width)/2048.));
+ options.inSampleSize = scale;
+ recycle = true;
+ }
+ Display display = getActivity().getWindowManager().getDefaultDisplay();
+ Point size = new Point();
+ int screenwidth;
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
+ display.getSize(size);
+ screenwidth = size.x;
+ } else {
+ screenwidth = display.getWidth();
+ }
+
+ Log.e("ASD", "W " + width + " SW " + screenwidth);
+
+ if (width > screenwidth) {
+ scale = (int) (Math.ceil(Math.max(height, width)/screenwidth));
+ options.inSampleSize = scale;
+ recycle = true;
+ }
+
+
+ if (recycle) bmp.recycle();
+ bmp = BitmapFactory.decodeFile(mFile.getStoragePath(), options);
+
+ }
+ if (bmp != null) {
+ preview.setImageBitmap(bmp);
+ }
}
} catch (OutOfMemoryError e) {
+ preview.setVisibility(View.INVISIBLE);
Log.e(TAG, "Out of memory occured for file with size " + mFile.getFileLength());
+
+ } catch (NoSuchFieldError e) {
+ preview.setVisibility(View.INVISIBLE);
+ Log.e(TAG, "Error from access to unexisting field despite protection " + mFile.getFileLength());
+
+ } catch (Throwable t) {
+ preview.setVisibility(View.INVISIBLE);
+ Log.e(TAG, "Unexpected error while creating image preview " + mFile.getFileLength(), t);
}
+
+ // Change download button to open button
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());
- startActivity(i);
+ String storagePath = mFile.getStoragePath();
+ try {
+ Intent i = new Intent(Intent.ACTION_VIEW);
+ i.setDataAndType(Uri.parse("file://"+ storagePath), 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://"+mFile.getStoragePath()), 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();
+ }
+ }
+
+ }
}
});
} else {
@@ -209,6 +381,7 @@ public class FileDetailFragment extends SherlockFragment implements
}
}
+
/**
* Updates the filename in view
* @param filename to set
@@ -245,8 +418,11 @@ public class FileDetailFragment extends SherlockFragment implements
*/
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);
}
}
@@ -260,6 +436,25 @@ public class FileDetailFragment extends SherlockFragment implements
tv.setText(DisplayUtils.unixTimeToHumanReadable(milliseconds));
}
}
+
+ /**
+ * 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
+ * ownCloud has this fix.
+ * @return True, if ownCloud the ownCloud version is supporting creation time
+ */
+ private boolean ocVersionSupportsTimeCreated(){
+ /*if(mAccount != null){
+ AccountManager accManager = (AccountManager) getActivity().getSystemService(Context.ACCOUNT_SERVICE);
+ OwnCloudVersion ocVersion = new OwnCloudVersion(accManager
+ .getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));
+ if(ocVersion.compareTo(new OwnCloudVersion(0x030000)) < 0) {
+ return true;
+ }
+ }*/
+ return false;
+ }
/**
* Once the file download has finished -> update view
@@ -268,9 +463,130 @@ public class FileDetailFragment extends SherlockFragment implements
private class DownloadFinishReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- updateFileDetails();
+ getView().findViewById(R.id.fdDownloadBtn).setEnabled(true);
+ if (intent.getAction().equals(FileDownloader.BAD_DOWNLOAD_MESSAGE)) {
+ Toast.makeText(context, R.string.downloader_download_failed , Toast.LENGTH_SHORT).show();
+
+ } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
+ mFile.setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH));
+ updateFileDetails();
+ }
}
-
+
}
+
+ // this is a temporary class for sharing purposes, it need to be replacead in transfer service
+ private class ShareRunnable implements Runnable {
+ private String mPath;
+ public ShareRunnable(String path) {
+ mPath = path;
+ }
+
+ public void run() {
+ AccountManager am = AccountManager.get(getActivity());
+ Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
+ OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(account, AccountAuthenticator.KEY_OC_VERSION));
+ String url = am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL) + AccountUtils.getWebdavPath(ocv);
+
+ Log.d("share", "sharing for version " + ocv.toString());
+
+ if (ocv.compareTo(new OwnCloudVersion(0x040000)) >= 0) {
+ String APPS_PATH = "/apps/files_sharing/";
+ String SHARE_PATH = "ajax/share.php";
+
+ String SHARED_PATH = "/apps/files_sharing/get.php?token=";
+
+ final String WEBDAV_SCRIPT = "webdav.php";
+ final String WEBDAV_FILES_LOCATION = "/files/";
+
+ WebdavClient wc = new WebdavClient();
+ HttpConnectionManagerParams params = new HttpConnectionManagerParams();
+ params.setMaxConnectionsPerHost(wc.getHostConfiguration(), 5);
+
+ //wc.getParams().setParameter("http.protocol.single-cookie-header", true);
+ //wc.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
+
+ PostMethod post = new PostMethod(am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL) + APPS_PATH + SHARE_PATH);
+
+ post.addRequestHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8" );
+ post.addRequestHeader("Referer", am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL));
+ List