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 ff85ff2..8f87ad7 160000 (submodule)
--- 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 f5ea7bc..af79535 100644 (file)
--- 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 63f7493..7cdcc08 100644 (file)
--- 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);