From: masensio <masensio@solidgear.es>
Date: Tue, 18 Feb 2014 14:16:22 +0000 (+0100)
Subject: Merge pull request #405 from owncloud/wide_scope_library_clean_up
X-Git-Tag: oc-android-1.5.5~41
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3b4baa1faa220873fdbe1930efb166017bcef336?hp=-c

Merge pull request #405 from owncloud/wide_scope_library_clean_up

Wide scope library clean up
---

3b4baa1faa220873fdbe1930efb166017bcef336
diff --combined src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index deb981e5,9a49b2c2..87fd6869
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -27,8 -27,8 +27,8 @@@ import com.owncloud.android.datamodel.F
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
- import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
- import com.owncloud.android.lib.operations.common.RemoteOperation;
+ import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+ import com.owncloud.android.lib.common.operations.RemoteOperation;
  import com.owncloud.android.operations.RemoveFileOperation;
  import com.owncloud.android.operations.RenameFileOperation;
  import com.owncloud.android.operations.SynchronizeFileOperation;
@@@ -42,10 -42,9 +42,10 @@@ import com.owncloud.android.ui.preview.
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
  import com.owncloud.android.utils.Log_OC;
  
 -
  import android.accounts.Account;
  import android.app.Activity;
 +import android.content.Intent;
 +import android.net.Uri;
  import android.os.Bundle;
  import android.os.Handler;
  import android.view.ContextMenu;
@@@ -222,7 -221,6 +222,7 @@@ public class OCFileListFragment extend
              toHide.add(R.id.action_cancel_upload);
              toHide.add(R.id.action_sync_file);
              toHide.add(R.id.action_see_details);
 +            toHide.add(R.id.action_share_file);
              if (    mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) ||
                      mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)           ) {
                  toDisable.add(R.id.action_rename_file);
@@@ -361,14 -359,6 +361,14 @@@
                  ((FileFragment.ContainerActivity)getActivity()).showDetails(mTargetFile);
                  return true;
              }
 +            case R.id.action_send_file: {
 +                Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 +                // set MimeType
 +                sharingIntent.setType(mTargetFile.getMimetype());
 +                sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+mTargetFile.getStoragePath()));
 +                startActivity(Intent.createChooser(sharingIntent, "Share via")); 
 +                return true;
 +            }
              default:
                  return super.onContextItemSelected(item); 
          }
diff --combined src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 5a346867,b323e5f1..1582b6af
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@@ -52,10 -52,10 +52,10 @@@ import com.actionbarsherlock.view.MenuI
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
- import com.owncloud.android.lib.network.webdav.WebdavUtils;
- import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
- import com.owncloud.android.lib.operations.common.RemoteOperation;
- import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+ import com.owncloud.android.lib.common.network.WebdavUtils;
+ import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
+ import com.owncloud.android.lib.common.operations.RemoteOperation;
+ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
  import com.owncloud.android.operations.RemoveFileOperation;
  import com.owncloud.android.ui.activity.FileActivity;
  import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
@@@ -310,23 -310,11 +310,23 @@@ public class PreviewImageFragment exten
                  seeDetails();
                  return true;
              }
 +            case R.id.action_send_file: {
 +                shareFile();
 +                return true;
 +            }
              
              default:
                  return false;
          }
      }
 +    
 +    private void shareFile(){
 +        Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 +        // set MimeType
 +        sharingIntent.setType(getFile().getMimetype());
 +        sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+getFile().getStoragePath()));
 +        startActivity(Intent.createChooser(sharingIntent, "Share via"));
 +    }