From: David A. Velasco Date: Thu, 29 Oct 2015 15:16:36 +0000 (+0100) Subject: Refactoring: a single method to request ShareActivity X-Git-Tag: oc-android-1.9^2~30^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d89488ea015c6310328890c1c0afff165544b982?ds=inline;hp=--cc Refactoring: a single method to request ShareActivity --- d89488ea015c6310328890c1c0afff165544b982 diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index 753dff1d..a22de8ef 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -278,6 +278,11 @@ public class FileOperationsHelper { } } + /** + * Show an instance of {@link ShareType} for sharing or unsharing the {@OCFile} received as parameter. + * + * @param file File to share or unshare. + */ public void showShareFile(OCFile file){ Intent intent = new Intent(mFileActivity, ShareActivity.class); intent.putExtra(mFileActivity.EXTRA_FILE, file); diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 27d55c7b..e814c2d3 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1236,20 +1236,6 @@ public class FileDisplayActivity extends HookActivity setFile(file); } - /** - * Shows the share view for sharing {@link OCFile} received as a - * parameter in the second fragment. - * - * @param file {@link OCFile} File to share with - */ - @Override - public void showShareFile(OCFile file) { - Intent intent = new Intent(this, ShareActivity.class); - intent.putExtra(EXTRA_FILE, file); - intent.putExtra(EXTRA_ACCOUNT, getAccount()); - startActivity(intent); - } - @Override protected void updateActionBarTitleAndHomeButton(OCFile chosenFile) { if (mDualPane) { diff --git a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java index 8e88f3e6..2f02dcd6 100644 --- a/src/com/owncloud/android/ui/activity/FolderPickerActivity.java +++ b/src/com/owncloud/android/ui/activity/FolderPickerActivity.java @@ -38,7 +38,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; -import android.view.Window; import android.widget.Button; import android.widget.ProgressBar; import android.widget.Toast; @@ -558,17 +557,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C } - /** - * Shows the share view for sharing {@link OCFile} received as a - * parameter in the second fragment. - * - * @param file {@link OCFile} File to share with - */ - @Override - public void showShareFile(OCFile file) { - - } - @Override public void onRefresh() { refreshList(true); diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java index 8b1cedb4..cacfa2d4 100644 --- a/src/com/owncloud/android/ui/fragment/FileFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileFragment.java @@ -143,12 +143,6 @@ public class FileFragment extends Fragment { */ public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading); - /** - * Request the parent activity to show the view for sharing an {@link OCFile}. - * - * @param file File to share - */ - public void showShareFile(OCFile file); } } diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 599959d1..066ff0a2 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -348,7 +348,7 @@ public class OCFileListFragment extends ExtendedListFragment return true; } case R.id.action_share_with_users: { - mContainerActivity.showShareFile(mTargetFile); + mContainerActivity.getFileOperationsHelper().showShareFile(mTargetFile); return true; } case R.id.action_open_file_with: { diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index b3b949a9..20b8de1d 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -400,19 +400,6 @@ public class PreviewImageActivity extends FileActivity implements } - /** - * Shows the share view for sharing {@link OCFile} received as a - * parameter in the second fragment. - * - * @param file {@link OCFile} File to share with - */ - @Override - public void showShareFile(OCFile file) { - Intent intent = new Intent(this, ShareActivity.class); - intent.putExtra(EXTRA_FILE, file); - intent.putExtra(EXTRA_ACCOUNT, getAccount()); - startActivity(intent); - } private void requestForDownload(OCFile file) { if (mDownloaderBinder == null) { Log_OC.d(TAG, "requestForDownload called without binder to download service"); diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index a65338c0..a114fabd 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -290,7 +290,7 @@ public class PreviewImageFragment extends FileFragment { return true; } case R.id.action_share_with_users: { - seeShareFile(); + mContainerActivity.getFileOperationsHelper().showShareFile(getFile()); return true; } case R.id.action_unshare_file: { @@ -336,10 +336,6 @@ public class PreviewImageFragment extends FileFragment { mContainerActivity.showDetails(getFile()); } - private void seeShareFile(){ - mContainerActivity.showShareFile(getFile()); - } - @Override public void onResume() { super.onResume(); diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index ab677745..2c5527c0 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -421,7 +421,7 @@ public class PreviewMediaFragment extends FileFragment implements private void seeShareFile() { stopPreview(false); - mContainerActivity.showShareFile(getFile()); + mContainerActivity.getFileOperationsHelper().showShareFile(getFile()); } private void prepareVideo() { diff --git a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java index 574a9273..a07d3dff 100644 --- a/src/com/owncloud/android/ui/preview/PreviewTextFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewTextFragment.java @@ -303,7 +303,7 @@ public class PreviewTextFragment extends FileFragment { return true; } case R.id.action_share_with_users: { - seeShareFile(); + mContainerActivity.getFileOperationsHelper().showShareFile(getFile()); return true; } case R.id.action_unshare_file: { @@ -354,10 +354,6 @@ public class PreviewTextFragment extends FileFragment { mContainerActivity.showDetails(getFile()); } - private void seeShareFile(){ - mContainerActivity.showShareFile(getFile()); - } - @Override public void onPause() { Log_OC.e(TAG, "onPause");