Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:33:23 +0000 (13:33 +0100)
committermasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:33:23 +0000 (13:33 +0100)
1  2 
res/values/setup.xml
res/values/strings.xml
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java

Simple merge
        <string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
        <string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
        <string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
-       
 +      <string name="activity_chooser_send_file_title">Send</string>
++
+       <string name="copy_link">Copy link</string>     
+       <string name="clipboard_text_copied">Copied to clipboard</string>
  </resources>
@@@ -160,23 -166,4 +166,23 @@@ public class FileOperationsHelper 
              
          }
      }
-             DialogFragment chooserDialog = ActivityChooserDialog.newInstance(sendIntent, packagesToExclude, file);
 +    
 +    public void sendDownloadedFile(OCFile file, FileActivity callerActivity) {
 +        if (file != null) {
 +            Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
 +            // set MimeType
 +            sendIntent.setType(file.getMimetype());
 +            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + file.getStoragePath()));
 +            sendIntent.putExtra(Intent.ACTION_SEND, true);      // Send Action
 +            
 +            // Show dialog, without the own app
 +            String[] packagesToExclude = new String[] { callerActivity.getPackageName() };
++            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file);
 +            chooserDialog.show(callerActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
 +
 +        } else {
 +            Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
 +        }
 +    }
 +
  }
index 0000000,e0e76d1..68e1485
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,160 +1,183 @@@
 -        return new AlertDialog.Builder(getSherlockActivity())
 -                   .setTitle(R.string.activity_chooser_title)
 -                   .setAdapter(mAdapter, new DialogInterface.OnClickListener() {
 -                           @Override
 -                           public void onClick(DialogInterface dialog, int which) {
 -                               // Add the information of the chosen activity to the intent to send 
 -                               ResolveInfo chosen = mAdapter.getItem(which);
 -                               ActivityInfo actInfo = chosen.activityInfo;
 -                               ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
 -                               mIntent.setComponent(name);                               
 -                               
 -                               // Create a new share resource
 -                               FileOperationsHelper foh = new FileOperationsHelper();
 -                               foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity()); 
 -                           }
 -                       })
 -                   .create();
+ /* ownCloud Android client application
+  *   Copyright (C) 2012-2014 ownCloud Inc.
+  *
+  *   This program is free software: you can redistribute it and/or modify
+  *   it under the terms of the GNU General Public License version 2,
+  *   as published by the Free Software Foundation.
+  *
+  *   This program is distributed in the hope that it will be useful,
+  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *   GNU General Public License for more details.
+  *
+  *   You should have received a copy of the GNU General Public License
+  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
+  */
+ package com.owncloud.android.ui.dialog;
+ import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.Iterator;
+ import java.util.List;
+ import android.app.AlertDialog;
+ import android.app.Dialog;
+ import android.content.ComponentName;
+ import android.content.Context;
+ import android.content.DialogInterface;
+ import android.content.Intent;
+ import android.content.pm.ActivityInfo;
+ import android.content.pm.PackageManager;
+ import android.content.pm.ResolveInfo;
+ import android.os.Bundle;
+ import android.view.LayoutInflater;
+ import android.view.View;
+ import android.view.ViewGroup;
+ import android.widget.ArrayAdapter;
+ import android.widget.ImageView;
+ import android.widget.TextView;
+ import com.actionbarsherlock.app.SherlockDialogFragment;
+ import com.owncloud.android.R;
+ import com.owncloud.android.datamodel.OCFile;
+ import com.owncloud.android.files.FileOperationsHelper;
+ import com.owncloud.android.ui.activity.CopyToClipboardActivity;
+ import com.owncloud.android.ui.activity.FileActivity;
+ import com.owncloud.android.utils.Log_OC;
+ /**
+  * Dialog showing a list activities able to resolve a given Intent, 
+  * filtering out the activities matching give package names.
+  * 
+  * @author David A. Velasco
+  */
+ public class ShareLinkToDialog  extends SherlockDialogFragment {
+     
+     private final static String TAG =  ShareLinkToDialog.class.getSimpleName();
+     private final static String ARG_INTENT =  ShareLinkToDialog.class.getSimpleName() + ".ARG_INTENT";
+     private final static String ARG_PACKAGES_TO_EXCLUDE =  ShareLinkToDialog.class.getSimpleName() + ".ARG_PACKAGES_TO_EXCLUDE";
+     private final static String ARG_FILE_TO_SHARE = ShareLinkToDialog.class.getSimpleName() + ".FILE_TO_SHARE";
+     
+     private ActivityAdapter mAdapter;
+     private OCFile mFile;
+     private Intent mIntent;
+     
+     public static ShareLinkToDialog newInstance(Intent intent, String[] packagesToExclude, OCFile fileToShare) {
+         ShareLinkToDialog f = new ShareLinkToDialog();
+         Bundle args = new Bundle();
+         args.putParcelable(ARG_INTENT, intent);
+         args.putStringArray(ARG_PACKAGES_TO_EXCLUDE, packagesToExclude);
+         args.putParcelable(ARG_FILE_TO_SHARE, fileToShare);
+         f.setArguments(args);
+         return f;
+     }
+     
+     public ShareLinkToDialog() {
+         super();
+         Log_OC.d(TAG, "constructor");
+     }
+     
+     @Override
+     public Dialog onCreateDialog(Bundle savedInstanceState) {
+         mIntent = getArguments().getParcelable(ARG_INTENT);
+         String[] packagesToExclude = getArguments().getStringArray(ARG_PACKAGES_TO_EXCLUDE);
+         List<String> packagesToExcludeList = Arrays.asList(packagesToExclude != null ? packagesToExclude : new String[0]);
+         mFile = getArguments().getParcelable(ARG_FILE_TO_SHARE);
+         
+         PackageManager pm= getSherlockActivity().getPackageManager();
+         List<ResolveInfo> activities = pm.queryIntentActivities(mIntent, PackageManager.MATCH_DEFAULT_ONLY);
+         Iterator<ResolveInfo> it = activities.iterator();
+         ResolveInfo resolveInfo;
+         while (it.hasNext()) {
+             resolveInfo = it.next();
+             if (packagesToExcludeList.contains(resolveInfo.activityInfo.packageName.toLowerCase())) {
+                 it.remove();
+             }
+         }
+         
+         // add activity for copy to clipboard
+         Intent copyToClipboardIntent = new Intent(getSherlockActivity(), CopyToClipboardActivity.class);
+         List<ResolveInfo> copyToClipboard = pm.queryIntentActivities(copyToClipboardIntent, 0);
+         if (!copyToClipboard.isEmpty()) {
+             activities.add(copyToClipboard.get(0));
+         }
+         
+         Collections.sort(activities, new ResolveInfo.DisplayNameComparator(pm)); 
+         mAdapter = new ActivityAdapter(getSherlockActivity(), pm, activities);
+         
++        boolean sendAction = mIntent.getBooleanExtra(Intent.ACTION_SEND, false);
++        
++        if (sendAction) {
++        
++            return new AlertDialog.Builder(getSherlockActivity())
++                       .setTitle(R.string.activity_chooser_send_file_title)
++                       .setAdapter(mAdapter, new DialogInterface.OnClickListener() {
++                               @Override
++                               public void onClick(DialogInterface dialog, int which) {
++                                   // Add the information of the chosen activity to the intent to send 
++                                   ResolveInfo chosen = mAdapter.getItem(which);
++                                   ActivityInfo actInfo = chosen.activityInfo;
++                                   ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
++                                   mIntent.setComponent(name);                               
++                                   
++                                   // Send the file
++                                   ((FileActivity)getSherlockActivity()).startActivity(mIntent);
++
++                               }
++                           })
++                       .create();
++        } else {
++            return new AlertDialog.Builder(getSherlockActivity())
++                       .setTitle(R.string.activity_chooser_title)
++                       .setAdapter(mAdapter, new DialogInterface.OnClickListener() {
++                               @Override
++                               public void onClick(DialogInterface dialog, int which) {
++                                   // Add the information of the chosen activity to the intent to send 
++                                   ResolveInfo chosen = mAdapter.getItem(which);
++                                   ActivityInfo actInfo = chosen.activityInfo;
++                                   ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
++                                   mIntent.setComponent(name);                               
++                            
++                                   // Create a new share resource
++                                   FileOperationsHelper foh = new FileOperationsHelper();
++                                   foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity()); 
++                               }
++                           })
++                       .create();
++        }
+     }
+     
+     class ActivityAdapter extends ArrayAdapter<ResolveInfo> {
+         
+         private PackageManager mPackageManager;
+         
+         ActivityAdapter(Context context, PackageManager pm, List<ResolveInfo> apps) {
+             super(context, R.layout.activity_row, apps);
+             this.mPackageManager = pm;
+         }
+         
+         @Override
+         public View getView(int position, View convertView, ViewGroup parent) {
+             if (convertView == null) {
+                 convertView = newView(parent);
+             }
+             bindView(position, convertView);
+             return convertView;
+         }
+         
+         private View newView(ViewGroup parent) {
+             return(((LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.activity_row, parent, false));
+         }
+         
+         private void bindView(int position, View row) {
+             TextView label = (TextView) row.findViewById(R.id.title);
+             label.setText(getItem(position).loadLabel(mPackageManager));
+             ImageView icon = (ImageView) row.findViewById(R.id.icon);
+             icon.setImageDrawable(getItem(position).loadIcon(mPackageManager));
+         }
+     }
+     
+ }