From: David A. Velasco Date: Tue, 20 Jan 2015 10:28:36 +0000 (+0100) Subject: Revert changes for files uploading X-Git-Tag: oc-android-1.7.0_signed~23^2~9 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d2883905c637467f46964abaf7dd199f47f6fba9?ds=inline;hp=--cc Revert changes for files uploading --- d2883905c637467f46964abaf7dd199f47f6fba9 diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index e543b443..2ba0415a 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -572,8 +572,4 @@ public class OCFile implements Parcelable, Comparable { return false; } - public boolean isUploading() { - // TODO real implementation - return false; - } } diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java index 0d138c81..f2a0baf7 100644 --- a/src/com/owncloud/android/files/FileMenuFilter.java +++ b/src/com/owncloud/android/files/FileMenuFilter.java @@ -43,6 +43,7 @@ import com.owncloud.android.ui.activity.ComponentsGetter; public class FileMenuFilter { private OCFile mFile; + private ComponentsGetter mComponentsGetter; private Account mAccount; private Context mContext; @@ -51,11 +52,14 @@ public class FileMenuFilter { * * @param targetFile {@link OCFile} target of the action to filter in the {@link Menu}. * @param account ownCloud {@link Account} holding targetFile. + * @param cg Accessor to app components, needed to access the + * {@link FileUploader} and {@link FileDownloader} services * @param context Android {@link Context}, needed to access build setup resources. */ - public FileMenuFilter(OCFile targetFile, Account account, Context context) { + public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg, Context context) { mFile = targetFile; mAccount = account; + mComponentsGetter = cg; mContext = context; } @@ -135,9 +139,10 @@ public class FileMenuFilter { private void filter(List toShow, List toHide) { boolean downloading = false; boolean uploading = false; - if (mFile != null && mAccount != null) { + if (mComponentsGetter != null && mFile != null && mAccount != null) { downloading = mFile.isDownloading() || mFile.isSynchronizing(); - uploading = mFile.isUploading(); + FileUploaderBinder uploaderBinder = mComponentsGetter.getFileUploaderBinder(); + uploading = (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile)); } /// decision is taken for each possible action on a file in the menu diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index 48c45b93..c8cb2756 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -297,7 +297,7 @@ public class FileOperationsHelper { downloaderBinder.cancel(account, file); - } else if (uploaderBinder != null && file.isUploading()) { + } else if (uploaderBinder != null && uploaderBinder.isUploading(account, file)) { uploaderBinder.cancel(account, file); } } else { diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index acbc405d..386f1857 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -372,10 +372,9 @@ public class FileUploader extends Service implements OnDatatransferProgressListe * * If 'file' is a directory, returns 'true' if some of its descendant files is uploading or waiting to upload. * - * @param account Owncloud account where the remote file will be stored. - * @param file A file that could be in the queue of pending uploads + * @param account ownCloud account where the remote file will be stored. + * @param file A file that could be in the queue of pending uploads */ - /* public boolean isUploading(Account account, OCFile file) { if (account == null || file == null) return false; @@ -394,7 +393,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } } } - */ /** diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 4803e01d..bfec11cc 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -41,6 +41,8 @@ import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.datamodel.ThumbnailsCacheManager; +import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; +import com.owncloud.android.ui.activity.ComponentsGetter; import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.FileStorageUtils; @@ -63,18 +65,22 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { private FileDataStorageManager mStorageManager; private Account mAccount; + private ComponentsGetter mTransferServiceGetter; private SharedPreferences mAppPreferences; public FileListListAdapter( boolean justFolders, - Context context + Context context, + ComponentsGetter transferServiceGetter ) { mJustFolders = justFolders; mContext = context; mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext); + mTransferServiceGetter = transferServiceGetter; + mAppPreferences = PreferenceManager .getDefaultSharedPreferences(mContext); @@ -145,10 +151,11 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2); localStateView.bringToFront(); + FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder(); if (file.isSynchronizing() || file.isDownloading()) { localStateView.setImageResource(R.drawable.downloading_file_indicator); localStateView.setVisibility(View.VISIBLE); - } else if (file.isUploading()) { + } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) { localStateView.setImageResource(R.drawable.uploading_file_indicator); localStateView.setVisibility(View.VISIBLE); } else if (file.isDown()) { diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index e1571ffb..dc607b51 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -179,6 +179,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener FileMenuFilter mf = new FileMenuFilter( getFile(), mContainerActivity.getStorageManager().getAccount(), + mContainerActivity, getSherlockActivity() ); mf.filter(menu); @@ -345,9 +346,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener cb.setChecked(file.keepInSync()); // configure UI for depending upon local state of the file - FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder(); FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder(); - if (transferring || file.isDownloading() || file.isUploading()) { + if (transferring || file.isDownloading() || uploaderBinder.isUploading(mAccount, file)) { setButtonsForTransferring(); } else if (file.isDown()) { @@ -446,9 +446,10 @@ public class FileDetailFragment extends FileFragment implements OnClickListener getView().findViewById(R.id.fdProgressBlock).setVisibility(View.VISIBLE); TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText); progressText.setVisibility(View.VISIBLE); + FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder(); if (getFile().isDownloading()) { progressText.setText(R.string.downloader_download_in_progress_ticker); - } else if (getFile().isUploading()) { + } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, getFile())) { progressText.setText(R.string.uploader_upload_in_progress_ticker); } } diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 5820119d..b70262ff 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -131,7 +131,8 @@ public class OCFileListFragment extends ExtendedListFragment { boolean justFolders = (args == null) ? false : args.getBoolean(ARG_JUST_FOLDERS, false); mAdapter = new FileListListAdapter( justFolders, - getSherlockActivity() + getSherlockActivity(), + mContainerActivity ); setListAdapter(mAdapter); @@ -252,6 +253,7 @@ public class OCFileListFragment extends ExtendedListFragment { FileMenuFilter mf = new FileMenuFilter( targetFile, mContainerActivity.getStorageManager().getAccount(), + mContainerActivity, getSherlockActivity() ); mf.filter(menu); diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 48a45be7..0995793d 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -232,6 +232,7 @@ public class PreviewImageFragment extends FileFragment { FileMenuFilter mf = new FileMenuFilter( getFile(), mContainerActivity.getStorageManager().getAccount(), + mContainerActivity, getSherlockActivity() ); mf.filter(menu); diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index fe488d43..7d6489b2 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -277,6 +277,7 @@ public class PreviewMediaFragment extends FileFragment implements FileMenuFilter mf = new FileMenuFilter( getFile(), mContainerActivity.getStorageManager().getAccount(), + mContainerActivity, getSherlockActivity() ); mf.filter(menu);