From: masensio <masensio@solidgear.es>
Date: Mon, 22 Jun 2015 12:03:21 +0000 (+0200)
Subject: Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
X-Git-Tag: oc-android-1.7.2~1^2~13^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2fbd757d66a24a3be234994ae175cf211b68d1ff?hp=8981be0c716430d58ac00955c6b1db367e60efcd

Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads

Conflicts:
	owncloud-android-library
---

diff --git a/owncloud-android-library b/owncloud-android-library
index ff85ff2e..8f87ad78 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a
+Subproject commit 8f87ad78f752fd44c419d1595482247cae5d056b
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5ea7bcb..af79535a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -343,7 +343,7 @@
 	<string name="shared_subject_header">shared</string>
 	<string name="with_you_subject_header">with you</string>
     
-	<string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
+	<string name="subject_token">%1$s shared \"%2$s\" with you</string>
 
     <string name="auth_refresh_button">Refresh connection</string>
     <string name="auth_host_address">Server address</string>
diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java
index 63f7493e..7cdcc083 100644
--- a/src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/src/com/owncloud/android/operations/CreateShareOperation.java
@@ -27,7 +27,6 @@ package com.owncloud.android.operations;
 import android.content.Context;
 import android.content.Intent;
 
-import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -162,7 +161,8 @@ public class CreateShareOperation extends SyncOperation {
         OCFile file = getStorageManager().getFileByPath(mPath);
         if (file!=null) {
             mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
-            mSendIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(mContext.getString(R.string.subject_token),
+            mSendIntent.putExtra(Intent.EXTRA_SUBJECT,
+                    String.format(mContext.getString(R.string.subject_token),
                     getClient().getCredentials().getUsername(), file.getFileName()));
             file.setPublicLink(share.getShareLink());
             file.setShareByLink(true);