From: masensio <masensio@solidgear.es>
Date: Mon, 24 Feb 2014 12:33:23 +0000 (+0100)
Subject: Merge branch 'develop' into send_file_pr311_with_develop
X-Git-Tag: oc-android-1.5.5~22^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/af1f880b27f12c95703c37077e8074a9c9851df8?ds=inline;hp=-c

Merge branch 'develop' into send_file_pr311_with_develop
---

af1f880b27f12c95703c37077e8074a9c9851df8
diff --combined res/values/setup.xml
index c08f497e,948b4d35..932612ea
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -8,7 -8,7 +8,7 @@@
      <string name ="db_name">ownCloud</string>
      <string name ="data_folder">owncloud</string>
      <string name ="log_name">Owncloud_</string>
-     <string name ="default_display_name_for_root_folder">/</string>
+     <string name ="default_display_name_for_root_folder">ownCloud</string>
      
      <!-- URLs and flags related -->
      <string name="server_url"></string>
@@@ -21,10 -21,6 +21,10 @@@
      <string name="auth_method_oauth2">off</string>
      <string name="auth_method_saml_web_sso">off</string>
      
 +    <!-- Flags to enable/disable some features -->
 +    <string name = "send_files_to_other_apps">on</string>
 +    
 +    
      <!-- Colors -->
      <color name="login_background_color">#FFFFFF</color>
      <color name="login_logo_background_color">#FFFFFF</color>
@@@ -39,11 -35,11 +39,11 @@@
      <bool name="multiaccount_support">true</bool>
      
      <!-- Help, imprint and feedback -->
-     <bool name="help_enabled">false</bool>
+     <bool name="help_enabled">true</bool>
      <bool name="imprint_enabled">false</bool> 
-     <bool name="recommend_enabled">false</bool>
-     <bool name="feedback_enabled">false</bool>
-     <string name="url_help">https://owncloud.com/mobile/help</string>
+     <bool name="recommend_enabled">true</bool>
+     <bool name="feedback_enabled">true</bool>
+     <string name="url_help">http://owncloud.com/mobile/help</string>
      <string name="url_imprint"></string>
      <string name="mail_recommend">"mailto:"</string>
      <string name="mail_feedback">"mailto:apps@owncloud.com"</string>
diff --combined res/values/strings.xml
index af816994,b59e987c..60e4ecab
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -100,7 -100,7 +100,7 @@@
      <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
      <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
      <string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
-     <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
+     <string name="sync_foreign_files_forgotten_explanation">As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the remote file(s) in %5$s they were linked to.</string>
  	<string name="sync_current_folder_was_removed">Folder %1$s does not exist anymore</string>    
      <string name="foreign_files_move">"Move all"</string>
      <string name="foreign_files_success">"All files were moved"</string>
@@@ -252,6 -252,7 +252,9 @@@
  	<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>
diff --combined src/com/owncloud/android/files/FileOperationsHelper.java
index f77767d4,8843897c..5b74dc89
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@@ -28,11 -28,13 +28,13 @@@ import android.widget.Toast
  
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.OCFile;
+ 
  import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
  import com.owncloud.android.lib.common.network.WebdavUtils;
+ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
  import com.owncloud.android.services.OperationsService;
  import com.owncloud.android.ui.activity.FileActivity;
- import com.owncloud.android.ui.dialog.ActivityChooserDialog;
+ import com.owncloud.android.ui.dialog.ShareLinkToDialog;
  import com.owncloud.android.utils.Log_OC;
  
  /**
@@@ -88,7 -90,7 +90,7 @@@ public class FileOperationsHelper 
                  String link = "https://fake.url";
                  Intent intent = createShareWithLinkIntent(link);
                  String[] packagesToExclude = new String[] { callerActivity.getPackageName() };
-                 DialogFragment chooserDialog = ActivityChooserDialog.newInstance(intent, packagesToExclude, file);
+                 DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intent, packagesToExclude, file);
                  chooserDialog.show(callerActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
                  
              } else {
@@@ -135,11 -137,15 +137,15 @@@
      public boolean isSharedSupported(FileActivity callerActivity) {
          if (callerActivity.getAccount() != null) {
              AccountManager accountManager = AccountManager.get(callerActivity);
-             return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_SUPPORTS_SHARE_API));
+ 
+             String version = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION);
+             String versionString = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION_STRING);
+             return (new OwnCloudVersion(version, versionString)).isSharedSupported();
+             //return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API));
          }
          return false;
      }
 -
 +    
      
      public void unshareFileWithLink(OCFile file, FileActivity callerActivity) {
          
@@@ -160,23 -166,4 +166,23 @@@
              
          }
      }
 +    
 +    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 = ActivityChooserDialog.newInstance(sendIntent, packagesToExclude, file);
++            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");
 +        }
 +    }
 +
  }
diff --combined src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
index 00000000,e0e76d14..68e1485b
mode 000000,100644..100644
--- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
@@@ -1,0 -1,160 +1,183 @@@
+ /* 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);
+         
 -        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();
++        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));
+         }
+     }
+     
+ }